activerecord-typedstore 1.0.0.beta1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64a197e045ec0a6c19581176c6a62aaf1800ce77
-  data.tar.gz: ffcf6bcc94d684da15ed877cf9bda5244934145d
+  metadata.gz: ed8f250e16de47101a01c8633fb6587e58626ee0
+  data.tar.gz: e5dd919d347fb854e5d03f8aac3786f334645a15
 SHA512:
-  metadata.gz: ac1eca590e2d1e0daea3a72281219ae43d0ad47c1376bd5f155b1e66ef93e8a6cd3f0403d94d7a92de1791846b9b9df19cf1c017138eb37e767d1ad46dda2da5
-  data.tar.gz: 99169aeeafe4c40c39357d16e8cf6dd54de65fa97a9213635a686d5afe0da1848b00735f55fd73c77b4bd8be165c2b949b287d76334a2a82200732800be36f25
+  metadata.gz: 5cce7b2e70c3abf6df76ca6007c3d21e072f38b34a1d281fda28bdb514d2eb30bad2e2e9564833c28e82e8232fe68a8af5389211e4ac28f63b549a2005baf13e
+  data.tar.gz: 3a6498ef57cd94fcf86120c59ce5f8d40a006c4740e30f90d8b25e8482fa1bcb59ce857e2258e2eb9938e2ec9b2362251f9a3657d1a85e0654d23004008224a0

data/lib/active_record/typed_store/dsl.rb

@@ -6,6 +6,8 @@ module ActiveRecord::TypedStore
 
     def initialize(options)
       @coder = options.fetch(:coder) { default_coder }
+      @accessors = options[:accessors]
+      @accessors = [] if options[:accessors] == false
       @fields = {}
       yield self
     end
@@ -15,7 +17,7 @@ module ActiveRecord::TypedStore
     end
 
     def accessors
-      @fields.values.select { |v| v.accessor }.map(&:name)
+      @accessors || @fields.values.select(&:accessor).map(&:name)
     end
 
     delegate :keys, to: :@fields

data/lib/active_record/typed_store/extension.rb

@@ -18,7 +18,7 @@ module ActiveRecord::TypedStore
 
       def typed_store(store_attribute, options={}, &block)
         dsl = DSL.new(options, &block)
-        self.typed_stores = {}
+        self.typed_stores ||= {}
         self.typed_stores[store_attribute] = dsl
 
         typed_klass = TypedHash.create(dsl.fields.values)

data/lib/active_record/typed_store/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module TypedStore
-    VERSION = '1.0.0.beta1'
+    VERSION = '1.0.0'
   end
 end

data/spec/active_record/typed_store_spec.rb

@@ -526,6 +526,16 @@ shared_examples 'a store' do |retain_type=true|
       stores = model.class.typed_stores
       expect(stores[:settings].keys).to eq [:no_default, :name, :email, :cell_phone, :public, :enabled, :age, :max_length, :rate, :price, :published_on, :remind_on, :published_at, :remind_at, :total_price, :shipping_cost, :grades, :tags, :nickname, :author, :source, :signup, :country]
     end
+
+    it "can access keys even when accessors are not defined" do
+      stores = model.class.typed_stores
+      expect(stores[:explicit_settings].keys).to eq [:ip_address, :user_agent, :signup]
+    end
+
+    it "can access keys even when accessors are partially defined" do
+      stores = model.class.typed_stores
+      expect(stores[:partial_settings].keys).to eq [:tax_rate_key, :tax_rate]
+    end
   end
 
   it 'does not include blank attribute' do
@@ -645,6 +655,43 @@ shared_examples 'a store' do |retain_type=true|
 
   end
 
+  describe 'with no accessors' do
+
+    it 'cannot be accessed as a model attribute' do
+      expect(model).not_to respond_to :ip_address
+      expect(model).not_to respond_to :ip_address=
+    end
+
+    it 'cannot be queried' do
+      expect(model).not_to respond_to :ip_address?
+    end
+
+    it 'cannot be reset' do
+      expect(model).not_to respond_to :reset_ip_address!
+    end
+
+    it 'does not have dirty accessors' do
+      expect(model).not_to respond_to :ip_address_was
+    end
+
+    it 'still has casting a default handling' do
+      expect(model.explicit_settings[:ip_address]).to be == '127.0.0.1'
+    end
+
+  end
+
+  describe 'with some accessors' do
+
+    it 'does not define an attribute' do
+      expect(model).not_to respond_to :tax_rate_key
+    end
+
+    it 'define an attribute when included in the accessors array' do
+      expect(model).to respond_to :tax_rate
+    end
+
+  end
+
   describe '`any` attributes' do
 
     it 'accept any type' do
@@ -666,6 +713,12 @@ shared_examples 'a store' do |retain_type=true|
       expect(model.settings[:signup][:counter]).to eq 123
     end
 
+    it 'works with default hash without affecting unaccessible attributes' do
+      model.signup[:counter] = 123
+      model.save!
+      expect(model.explicit_settings[:signup][:counter]).to be_nil
+    end
+
   end
 end
 

data/spec/support/models.rb

@@ -51,12 +51,29 @@ def define_columns(t)
   t.string :nickname, blank: false, default: 'Please enter your nickname'
 end
 
-def define_store_columns(t)
-  define_columns(t)
-  t.any :author
-  t.any :source, blank: false, default: 'web'
-  t.any :signup, default: {}
-  t.string :country, blank: false, default: 'Canada', accessor: false
+def define_store_with_no_attributes(**options)
+  typed_store :explicit_settings, accessors: false, **options do |t|
+    t.string :ip_address, default: '127.0.0.1'
+    t.string :user_agent
+    t.any :signup, default: {}
+  end
+end
+
+def define_store_with_partial_attributes(**options)
+  typed_store :partial_settings, accessors: [:tax_rate], **options do |t|
+    t.string :tax_rate_key
+    t.string :tax_rate
+  end
+end
+
+def define_store_with_attributes(**options)
+  typed_store :settings, **options do |t|
+    define_columns(t)
+    t.any :author
+    t.any :source, blank: false, default: 'web'
+    t.any :signup, default: {}
+    t.string :country, blank: false, default: 'Canada', accessor: false
+  end
 end
 
 class CreateAllTables < ActiveRecord::Migration
@@ -89,9 +106,9 @@ class CreateAllTables < ActiveRecord::Migration
 
     ActiveRecord::Base.establish_connection(:test_sqlite3)
     recreate_table(:sqlite3_regular_ar_models) { |t| define_columns(t); t.text :untyped_settings }
-    recreate_table(:yaml_typed_store_models) { |t| t.text :settings; t.text :untyped_settings }
-    recreate_table(:json_typed_store_models) { |t| t.text :settings; t.text :untyped_settings }
-    recreate_table(:marshal_typed_store_models) { |t| t.text :settings; t.text :untyped_settings }
+    recreate_table(:yaml_typed_store_models) { |t| t.text :settings; t.text :explicit_settings; t.text :partial_settings; t.text :untyped_settings }
+    recreate_table(:json_typed_store_models) { |t| t.text :settings; t.text :explicit_settings; t.text :partial_settings; t.text :untyped_settings }
+    recreate_table(:marshal_typed_store_models) { |t| t.text :settings; t.text :explicit_settings; t.text :partial_settings; t.text :untyped_settings }
   end
 end
 ActiveRecord::Migration.verbose = true
@@ -147,9 +164,10 @@ if ENV['POSTGRES']
     class PostgresHstoreTypedStoreModel < ActiveRecord::Base
       establish_connection ENV['POSTGRES_URL'] || :test_postgresql
       store :untyped_settings, accessors: [:title]
-      typed_store :settings, coder: ColumnCoder.new(AsJson) do |s|
-        define_store_columns(s)
-      end
+
+      define_store_with_attributes(coder: ColumnCoder.new(AsJson))
+      define_store_with_no_attributes(coder: ColumnCoder.new(AsJson))
+      define_store_with_partial_attributes(coder: ColumnCoder.new(AsJson))
     end
 
     if ENV['POSTGRES_JSON']
@@ -159,9 +177,10 @@ if ENV['POSTGRES']
         class PostgresJsonTypedStoreModel < ActiveRecord::Base
           establish_connection ENV['POSTGRES_URL'] || :test_postgresql
           store :untyped_settings, accessors: [:title]
-          typed_store :settings, coder: false do |s|
-            define_store_columns(s)
-          end
+
+          define_store_with_attributes(coder: false)
+          define_store_with_no_attributes(coder: false)
+          define_store_with_partial_attributes(coder: false)
         end
 
       else
@@ -169,9 +188,10 @@ if ENV['POSTGRES']
         class PostgresJsonTypedStoreModel < ActiveRecord::Base
           establish_connection ENV['POSTGRES_URL'] || :test_postgresql
           store :untyped_settings, accessors: [:title]
-          typed_store :settings, coder: ColumnCoder.new(AsJson) do |s|
-            define_store_columns(s)
-          end
+
+          define_store_with_attributes(coder: ColumnCoder.new(AsJson))
+          define_store_with_no_attributes(coder: ColumnCoder.new(AsJson))
+          define_store_with_partial_attributes(coder: ColumnCoder.new(AsJson))
         end
 
       end
@@ -189,17 +209,19 @@ end
 class YamlTypedStoreModel < ActiveRecord::Base
   establish_connection :test_sqlite3
   store :untyped_settings, accessors: [:title]
-  typed_store :settings do |s|
-    define_store_columns(s)
-  end
+
+  define_store_with_attributes
+  define_store_with_no_attributes
+  define_store_with_partial_attributes
 end
 
 class JsonTypedStoreModel < ActiveRecord::Base
   establish_connection :test_sqlite3
   store :untyped_settings, accessors: [:title]
-  typed_store :settings, coder: ColumnCoder.new(JSON) do |s|
-    define_store_columns(s)
-  end
+
+  define_store_with_attributes(coder: ColumnCoder.new(JSON))
+  define_store_with_no_attributes(coder: ColumnCoder.new(JSON))
+  define_store_with_partial_attributes(coder: ColumnCoder.new(JSON))
 end
 
 module MarshalCoder
@@ -219,9 +241,10 @@ end
 class MarshalTypedStoreModel < ActiveRecord::Base
   establish_connection :test_sqlite3
   store :untyped_settings, accessors: [:title]
-  typed_store :settings, coder: ColumnCoder.new(MarshalCoder) do |s|
-    define_store_columns(s)
-  end
+
+  define_store_with_attributes(coder: ColumnCoder.new(MarshalCoder))
+  define_store_with_no_attributes(coder: ColumnCoder.new(MarshalCoder))
+  define_store_with_partial_attributes(coder: ColumnCoder.new(MarshalCoder))
 end
 
 Models = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-typedstore
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta1
+  version: 1.0.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -190,12 +190,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Add type casting and full method attributes support to RctiveRecord store