leafy-ruby 0.0.2 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 1e9b8ab7fa5fce879b69856041e24097cc574e41343f3c954c6256d45b8746c0
-  data.tar.gz: de0763a761626b180748303a01bd0cf9d403d012ac13c61af212051e1a65b35a
+SHA1:
+  metadata.gz: c26d92812d5952076dba88b883f46fea4213c681
+  data.tar.gz: e6d9d2473e0c31947cdaef28940464aad93f2897
 SHA512:
-  metadata.gz: e5390a02d111263752b418777d2cdcee9e224a9f3c52db573362da4d63f1af9f66f3cf17865d978c95d5317b18d87b4a379161f5f40efbc09bae1335ffca710e
-  data.tar.gz: d3e94469b3c0a7d22de8415a5f22550ac90dbf40f72c3986181914c75127c631c53fa1cc97cda8b40199cae5d7bdf4401e7e48071b4fd4dfa208d428565826c3
+  metadata.gz: b16830890b1ae949d5948518e14c89b2a8cf84d8f6e238c772c3bb604f0add0f5bb635766c59b97b496c3e0c43203dd05db9e73aec33f6d9e3e30f84290e0202
+  data.tar.gz: b595b079f9196968451ea11688f68ca1ba74e8ea5f2d07b468aaf24f8e937736c0ef6300d05ad8afd398587a307feae2fc5c90c9fceab0ec84909f2a2127d1e7

data/.gitignore

@@ -9,6 +9,8 @@
 /.idea/*
 /coverage/*
 .rbenv-gemsets
-Gemfile.lock
 # rspec failure tracking
 .rspec_status
+/.history/*
+Gemfile.lock
+.ruby-version

data/.travis.yml

@@ -2,21 +2,35 @@ sudo: false
 
 language: ruby
 
+services:
+  - postgresql
+
+addons:
+  postgresql: "10"
+  apt:
+    packages:
+    - postgresql-10
+    - postgresql-client-10
+
 rvm:
-  - 2.2
   - 2.3
   - 2.4
   - 2.5
+  - 2.6
+  - 2.7
   - ruby-head
-  - jruby-9.2.0.0
   - jruby-head
 
 matrix:
   allow_failures:
+    - rvm: jruby-9.2.0.0
+    - rvm: 2.2
     - rvm: ruby-head
     - rvm: jruby-head
 
-before_install: gem install bundler
+before_install:
+  - yes | gem update --system --force
+  - gem install bundler
 
 before_script:
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
@@ -32,7 +46,9 @@ cache: bundler
 
 env:
   global:
-    CC_TEST_REPORTER_ID=5c94ea74238649cee4b51abbe647de62a3d63971eaeca9aa58c82b62d9a0e6a8
-    COVERAGE=1
+    - CC_TEST_REPORTER_ID=5c94ea74238649cee4b51abbe647de62a3d63971eaeca9aa58c82b62d9a0e6a8
+    - COVERAGE=1
+    - PGPORT=5433
+
 
 

data/README.md

@@ -30,13 +30,13 @@ Include "Plain old ruby object" mixin into your class definition to start using
 ```ruby
 class SchemaHost < ActiveRecord::Base
   include Leafy::Mixin::Schema[:poro]
-  
+
   attr_accessor :leafy_data
 end
 
 class FieldsHost < ActiveRecord::Base
   include Leafy::Mixin::Fields[:poro]
-  
+
   attr_accessor :leafy_data
   attr_accessor :leafy_fields
 end
@@ -46,7 +46,7 @@ Schema mixin introduces next methods:
 
 - `#leafy_fields (Schema)` returns Schema instance allowing you to iterate through custom attribute definitions.
 - `#leafy_fields=` schema setter method
-- `#leafy_fields_attributes=` nested attributes setter method  
+- `#leafy_fields_attributes=` nested attributes setter method
 
 Fields mixin:
 
@@ -56,7 +56,7 @@ Fields mixin:
 
 **Please note**:
 Leafy is stateless and changing Schema instance won't reflect on your active record model instance.
-For changes to take place you have to explicitly assign schema or attributes data to the model. 
+For changes to take place you have to explicitly assign schema or attributes data to the model.
 
 
 
@@ -102,7 +102,7 @@ Add migration
 add_column :schema_hosts, :leafy_data, :text, null: false, default: "{}"
 add_column :fields_hosts, :leafy_data, :text, null: false, default: "{}"
 # for postgresql
-# add_column :leafy_data, :jsonb, null: false, default: {} 
+# add_column :leafy_data, :jsonb, null: false, default: {}
 ```
 
 Update your models
@@ -114,9 +114,9 @@ end
 
 class FieldsHost < ActiveRecord::Base
   include Leafy::Mixin::Fields[:active_record]
-  
+
   belongs_to :schema_host, required: true
-  delegate :leafy_fields, to: :schema_host 
+  delegate :leafy_fields, to: :schema_host
 end
 ```
 
@@ -143,6 +143,27 @@ target.leafy_values
 # => { "id_1": 123, "id_2": "test", "id_3": Time.new(2018,10,10, 10,10,10, "+03:00") }
 ```
 
+## Configuration
+
+In you initialization code
+
+```ruby
+class MyLovelyCoder
+  def dump(data)
+    "lovely_#{data}"
+  end
+
+  def load(data)
+    data.split("_")[1]
+  end
+end
+
+Leafy.configure do |config|
+  # you may wonna use oj instead
+  config.coder = MyLovelyCoder.new
+end
+```
+
 ## Adding your own types
 
 Leafy allows adding your own data types
@@ -155,8 +176,8 @@ class MyComplexTypeConverter
   def self.load(json_string)
     #  parsing logic
     return MyComplexType.new(parsed_data)
-  end 
-  
+  end
+
   def self.dump(my_complex_type_instance)
     # serializing logic
     return json
@@ -166,7 +187,7 @@ end
 Leafy.register_converter(:complex_type, MyComplexTypeConverter)
 ```
 
- 
+
 
 ## Contributing
 

data/leafy.gemspec

@@ -23,25 +23,26 @@ Gem::Specification.new do |spec|
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir        = "bin"
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
   spec.required_ruby_version = '>= 2.2'
+  spec.platform      = Gem::Platform::RUBY
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "simplecov", '~> 0.17.1'
 
-  if RUBY_VERSION >= "2.2.2"
-    spec.add_development_dependency "activerecord", "~> 5.0"
+  if RUBY_VERSION >= "2.5.0"
+    spec.add_development_dependency "activerecord", "~> 6.0"
   else
-    spec.add_development_dependency "activerecord", "~> 4.2"
+    spec.add_development_dependency "activerecord", "~> 5.2"
   end
 
   if RUBY_ENGINE == "jruby"
     spec.add_development_dependency "activerecord-jdbcsqlite3-adapter", "51"
+    spec.add_development_dependency "pg_jruby"
   else
     spec.add_development_dependency "sqlite3"
+    spec.add_development_dependency "pg"
   end
 end

data/lib/leafy.rb

@@ -9,10 +9,22 @@ require "leafy/field_value_collection"
 Dir[File.expand_path("../leafy/converter/**/*.rb", __FILE__)].each { |f| require f }
 require "leafy/mixin/schema"
 require "leafy/mixin/fields"
+require "leafy/coder/default"
+require "leafy/coder/mock"
+require "leafy/configuration"
 
 
 # module definition
 module Leafy
+
+  def self.configure
+    yield configuration if block_given?
+  end
+
+  def self.configuration
+    @config ||= Leafy::Configuration.new
+  end
+
   def self.register_converter(name, converter)
     raise(ArgumentError, "converter is not provided") if converter.nil?
 

data/lib/leafy/coder/default.rb

@@ -0,0 +1,5 @@
+module Leafy
+  module Coder
+    Default = JSON
+  end
+end

data/lib/leafy/coder/mock.rb

@@ -0,0 +1,13 @@
+module Leafy
+  module Coder
+    class Mock
+      def dump(data)
+        data
+      end
+
+      def load(data)
+        data
+      end
+    end
+  end
+end

data/lib/leafy/configuration.rb

@@ -0,0 +1,19 @@
+require 'json'
+
+module Leafy
+  class Configuration
+    attr_accessor :coder
+
+    def initialize
+      @coder = Leafy::Coder::Default
+    end
+
+    def coder=(value)
+      if value.respond_to?(:dump) && value.respond_to?(:load)
+        @coder = value
+      end
+
+      raise ArgumentError, "coder must implement #dump and #load"
+    end
+  end
+end

data/lib/leafy/field_value_collection.rb

@@ -4,6 +4,23 @@ module Leafy
   class FieldValueCollection
     include ::Enumerable
 
+    def initialize(leafy_fields, field_values: {}, ar_json: false)
+      @leafy_fields = leafy_fields
+      @coder = ar_json ? Leafy::Coder::Mock.new : Leafy.configuration.coder
+      self.leafy_field_values = field_values
+    end
+
+    def leafy_field_values=(data)
+      @leafy_field_values = @leafy_fields.map do |custom_field|
+        Leafy::FieldValue.new(
+          id: custom_field.id,
+          name: custom_field.name,
+          raw: data[custom_field.id],
+          type: custom_field.type
+        )
+      end
+    end
+
     def each
       if block_given?
         @leafy_field_values.each { |i| yield i }
@@ -20,18 +37,6 @@ module Leafy
       count
     end
 
-    def initialize(leafy_fields, values = {})
-      @leafy_fields = leafy_fields
-      @leafy_field_values = leafy_fields.map do |custom_field|
-        Leafy::FieldValue.new(
-          id: custom_field.id,
-          name: custom_field.name,
-          raw: values[custom_field.id],
-          type: custom_field.type
-        )
-      end
-    end
-
     def values
       inject({}) do |acc, field_value|
         acc[field_value.id] = field_value.value
@@ -40,19 +45,23 @@ module Leafy
     end
 
     def values=(attributes = {})
-      attributes = attributes.dup.to_a.map { |pair| [pair[0].to_s, pair[1]]}.to_h
+      _attributes = {}
+
+      attributes.each { |key, value| _attributes[key.to_s] = value }
 
       @leafy_field_values.each do |field_value|
-        field_value.value = attributes[field_value.id]
+        field_value.value = _attributes[field_value.id]
       end
     end
 
-    def self.dump(field_values_collection)
-      JSON.dump(field_values_collection.map { |field_value| [field_value.id, field_value.raw] }.to_h)
+    def dump
+      data = {}
+      each { |field_value| data[field_value.id] = field_value.raw }
+      @coder.dump(data)
     end
 
-    def self.load(leafy_fields, data)
-      Leafy::FieldValueCollection.new(leafy_fields, JSON.load(data))
+    def load(data)
+      self.leafy_field_values = @coder.load(data)
     end
 
   end

data/lib/leafy/mixin/active_record/fields.rb

@@ -24,11 +24,13 @@ module Leafy
             field_value_list = leafy_field_values
             field_value_list.values = attributes
 
-            self.leafy_data = ::Leafy::FieldValueCollection.dump(field_value_list)
+            self.leafy_data = field_value_list.dump
           end
 
           def leafy_field_values
-            ::Leafy::FieldValueCollection.load(leafy_fields, leafy_data || "{}")
+            field_value_collection = ::Leafy::FieldValueCollection.new(leafy_fields, ar_json: activerecord_json_column?)
+            field_value_collection.load(leafy_data || '{}')
+            field_value_collection
           end
         end
       end

data/lib/leafy/mixin/poro/fields.rb

@@ -22,11 +22,13 @@ module Leafy
             field_value_list = leafy_field_values
             field_value_list.values = attributes
 
-            self._leafy_data = ::Leafy::FieldValueCollection.dump(field_value_list)
+            self._leafy_data = field_value_list.dump
           end
 
           def leafy_field_values
-            ::Leafy::FieldValueCollection.load(leafy_fields, _leafy_data || "{}")
+            field_value_collection = ::Leafy::FieldValueCollection.new(leafy_fields)
+            field_value_collection.load(_leafy_data || '{}')
+            field_value_collection
           end
         end
       end

data/lib/leafy/version.rb

@@ -7,8 +7,8 @@ module Leafy
 
   module VERSION
     MAJOR = 0
-    MINOR = 0
-    TINY  = 2
+    MINOR = 1
+    TINY  = 1
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

metadata

@@ -1,59 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: leafy-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.1
 platform: ruby
 authors:
 - Evgeny Stepanov
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2018-11-04 00:00:00.000000000 Z
+date: 2020-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 0.17.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 0.17.1
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,21 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,7 +87,9 @@ description: |2
     It ships with several basic data types and allows you to add your own data type converters.
 email:
 - estepnv@icloud.com
-executables: []
+executables:
+- console
+- setup
 extensions: []
 extra_rdoc_files: []
 files:
@@ -116,6 +104,9 @@ files:
 - bin/setup
 - leafy.gemspec
 - lib/leafy.rb
+- lib/leafy/coder/default.rb
+- lib/leafy/coder/mock.rb
+- lib/leafy/configuration.rb
 - lib/leafy/converter/bool_converter.rb
 - lib/leafy/converter/date_converter.rb
 - lib/leafy/converter/datetime_converter.rb
@@ -157,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Toolkit for custom attributes in Ruby apps