activerecord-hstore_properties 0.0.3 → 0.0.4

data/activerecord-hstore_properties.gemspec

@@ -17,5 +17,15 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
+
+  gem.add_dependency 'activesupport', '>= 3.2.12'
+  gem.add_dependency 'activerecord-postgres-hstore', '>= 0.7.5'
+
   gem.add_development_dependency "rspec"
-end
+  gem.add_development_dependency "sqlite3"
+  gem.add_development_dependency "activerecord", '>= 3.2.12'
+  gem.add_development_dependency "with_model"
+  gem.add_development_dependency  "with_model", "~> 0.3.1"
+  gem.add_development_dependency  "pry"
+
+end

data/lib/active_record/hstore_properties.rb

@@ -1,35 +1,20 @@
+require 'active_support/core_ext/class'
+require 'active_support/concern'
 require "active_record/properties/base"
 require "active_record/properties/boolean_property"
 require "active_record/properties/counter_property"
 require "active_record/properties/number_property"
 require "active_record/properties/string_property"
-require "active_record/properties/extensions/booleans"
-require "active_record/properties/extensions/counters"
 
 module ActiveRecord
   module HstoreProperties
     extend ActiveSupport::Concern
 
     included do
-      include ActiveRecord::Properties::Extensions::Booleans
-      include ActiveRecord::Properties::Extensions::Counters
-
       serialize :properties, ::ActiveRecord::Coders::Hstore
       class_attribute :_properties
     end
 
-    def define_property_method(method_name, suffix, &block)
-      if method_name.ends_with?(suffix) and (self.class._properties.detect { |pn| pn.name.to_s == method_name.sub(suffix, '') })
-        prop_name = method_name.sub(suffix, '')
-        self.class.send(:define_method, method_name) do
-          block.call(prop_name, self)
-        end
-        [true, block.call(prop_name, self)]
-      else
-        [false, nil]
-      end
-    end
-
     module ClassMethods
       def properties_set(*args)
         self._properties.dup.tap do |all_properties|
@@ -45,13 +30,9 @@ module ActiveRecord
           self._properties ||= []
         else
           self._properties ||= []
-
           new_properties = extract_properties(args)
           self._properties += new_properties
-
-          new_properties.each do |property|
-            define_method("#{property.name.to_s}_property") { properties[property.name.to_s] }
-          end
+          define_accessors_for(new_properties)
         end
       end
 
@@ -61,6 +42,24 @@ module ActiveRecord
 
       private
 
+      def define_accessors_for(properties)
+        properties.each do |property|
+          property.class.property_accessors.each do |suffixes, proc|
+
+            method_names = suffixes.map{|suffix| "#{property.name}#{suffix}"}
+            primary_method_name = method_names.shift
+
+            #Define main method once...
+            define_method(primary_method_name) do
+              self.instance_exec(property, &proc)
+            end
+
+            #... and then define aliases
+            method_names.each { |method_name| alias_method(method_name, primary_method_name) }
+          end
+        end
+      end
+
       def extract_properties(args)
         typed_properties = args.extract_options!
 

data/lib/active_record/properties/base.rb

@@ -1,6 +1,23 @@
 module ActiveRecord
   module Properties
     class Base < Struct.new(:name)
+      class_attribute :_property_accessors
+
+      class << self
+        def property_accessors
+          self._property_accessors || {}
+        end
+
+        def add_property_accessor(*suffixes, &block)
+          self._property_accessors ||= {}
+          self._property_accessors = _property_accessors.merge(suffixes.to_a => block)
+        end
+      end
+
+      add_property_accessor '_property' do |property|
+        properties[property.name.to_s]
+      end
+
     end
   end
 end

data/lib/active_record/properties/boolean_property.rb

@@ -4,6 +4,24 @@ module ActiveRecord
       def formtastic_options
         {:as => :boolean, :checked_value => 'true', :unchecked_value => 'false'}
       end
+
+      add_property_accessor '_enabled?', '?' do |property|
+        ::ActiveRecord::ConnectionAdapters::Column.value_to_boolean(properties[property.name.to_s])
+      end
+
+      add_property_accessor '_raise!', '_enable!' do |property|
+        _properties = self.properties
+        _properties[property.name] = true
+        update_column(:properties, ActiveRecord::Coders::Hstore.new({}).dump(_properties))
+        _properties[property.name]
+      end
+
+      add_property_accessor '_lower!', '_disable!' do |property|
+        _properties = self.properties
+        _properties[property.name] = false
+        update_column(:properties, ActiveRecord::Coders::Hstore.new({}).dump(_properties))
+        _properties[property.name]
+      end
     end
   end
 end

data/lib/active_record/properties/counter_property.rb

@@ -4,6 +4,18 @@ module ActiveRecord
       def formtastic_options
         {:as => :number, :disabled => true}
       end
+
+      add_property_accessor '_count' do |property|
+        properties[property.name].to_i
+      end
+
+      add_property_accessor '_bump!' do |property|
+        _properties = self.properties
+        _properties[property.name] = self[property.name].to_i + 1
+        update_column(:properties, ActiveRecord::Coders::Hstore.new({}).dump(_properties))
+        _properties[property.name]
+      end
+
     end
   end
-end
+end

data/lib/activerecord-hstore_properties/version.rb

@@ -1,5 +1,5 @@
 module Activerecord
   module HstoreProperties
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/spec/hstore_properties_spec.rb

@@ -0,0 +1,101 @@
+require 'spec_helper'
+describe ActiveRecord::HstoreProperties do
+  with_model :Comment do
+    table do |t|
+      t.string :text
+      t.hstore :properties
+    end
+
+    model do
+      include ActiveRecord::HstoreProperties
+
+      #We need to do that, as sqlite does not support hstore
+      self.class_eval do
+        def properties
+          self[:properties].is_a?(Hash) ? self[:properties] : ActiveRecord::Coders::Hstore.load(self[:properties])
+        end
+      end
+    end
+  end
+
+  it "it should respond to properties call" do
+    Comment.respond_to?(:properties).should be_true
+  end
+
+  it "it should be possible to define properties" do
+    Comment.properties 'property_one', 'property_two'
+    Comment.properties.should be_an_instance_of(Array)
+    Comment.properties.map(&:name).should include('property_one', 'property_two')
+  end
+
+  it "by default properties should be of String type" do
+    Comment.properties 'property_one'
+    Comment.properties.first.should be_a_kind_of(ActiveRecord::Properties::StringProperty)
+  end
+
+  it "it should be possible to define property types other than string" do
+    Comment.properties 'property_one', 'property_two' => :boolean
+    Comment.properties.find { |p| p.name == 'property_two' }.should be_a_kind_of(ActiveRecord::Properties::BooleanProperty)
+  end
+
+  it "_property accessor should return raw property value" do
+    Comment.properties 'property_two' => :boolean
+    comment = Comment.new
+    comment.properties = {:property_two => true}
+    comment.save
+    comment.property_two_property.should == 'true'
+  end
+
+  it "properties_set should not return underscored properties" do
+    Comment.properties '_property_one', 'property_two'
+    Comment.properties_set.find{|p| p.name == '_property_one'}.should be_nil
+    Comment.properties_set.find{|p| p.name == 'property_two'}.should_not be_nil
+  end
+
+  context "boolean properties" do
+    before(:each) do
+      Comment.properties 'property_two' => :boolean
+      @comment = Comment.new
+      @comment.properties = {:property_two => true}
+      @comment.save
+    end
+
+    it "should be possible to be queried for state" do
+      @comment.property_two?.should == true
+      @comment.property_two_enabled?.should == true
+    end
+
+    it "should be possible to be toggled" do
+      @comment.property_two_lower!
+      @comment.property_two?.should == false
+      @comment.property_two_raise!
+      @comment.property_two?.should == true
+      @comment.property_two_disable!
+      @comment.property_two?.should == false
+      @comment.property_two_enable!
+      @comment.property_two?.should == true
+    end
+  end
+
+  context "counter properties" do
+    before(:each) do
+      Comment.properties 'property_two' => :counter
+      @comment = Comment.new
+      @comment.save
+    end
+
+    it "should be possible to bump counter" do
+      @comment.property_two_bump!
+      @comment.properties['property_two'].should == '1'
+    end
+
+    it "should be possible to query for current count" do
+      @comment.property_two_count.should == 0
+      @comment.property_two_bump!
+
+      @comment.property_two_count.should == 1
+    end
+
+    end
+
+end

data/spec/spec_helper.rb

@@ -1 +1,14 @@
-require 'activerecord-hstore_properties'
+require 'activerecord-hstore_properties'
+require 'with_model'
+require 'active_record'
+require 'activerecord-postgres-hstore'
+require 'pry'
+
+RSpec.configure do |config|
+  ActiveRecord::Base.establish_connection(
+      :adapter => 'sqlite3',
+      :database => ':memory:'
+  )
+
+  config.extend WithModel
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-hstore_properties
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-04-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.12
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.12
+- !ruby/object:Gem::Dependency
+  name: activerecord-postgres-hstore
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.5
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -27,6 +59,86 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.12
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.12
+- !ruby/object:Gem::Dependency
+  name: with_model
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: with_model
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Allows to describe field names that will be stored within hstore column
   together with their types. Data can then be retrieved with a set of helpful getters.
 email:
@@ -47,12 +159,11 @@ files:
 - lib/active_record/properties/base.rb
 - lib/active_record/properties/boolean_property.rb
 - lib/active_record/properties/counter_property.rb
-- lib/active_record/properties/extensions/booleans.rb
-- lib/active_record/properties/extensions/counters.rb
 - lib/active_record/properties/number_property.rb
 - lib/active_record/properties/string_property.rb
 - lib/activerecord-hstore_properties.rb
 - lib/activerecord-hstore_properties/version.rb
+- spec/hstore_properties_spec.rb
 - spec/spec_helper.rb
 - test/test_helper.rb
 homepage: https://github.com/stevo/activerecord-hstore_properties
@@ -80,5 +191,6 @@ signing_key:
 specification_version: 3
 summary: Facilitate defining and retrieving information from hstore column
 test_files:
+- spec/hstore_properties_spec.rb
 - spec/spec_helper.rb
 - test/test_helper.rb

data/lib/active_record/properties/extensions/booleans.rb

@@ -1,15 +0,0 @@
-module ActiveRecord
-  module Properties
-    module Extensions
-      module Booleans
-        def method_missing(*args, &block)
-          method_name = args.first.to_s
-          defined, result = define_property_method(method_name, '_enabled?') do |property_name, object|
-            ::ActiveRecord::ConnectionAdapters::Column.value_to_boolean(object.send("#{property_name}_property"))
-          end
-          defined ? result : super
-        end
-      end
-    end
-  end
-end

data/lib/active_record/properties/extensions/counters.rb

@@ -1,28 +0,0 @@
-# Allows fetching properties as numerical values by adding _count suffix
-
-module ActiveRecord
-  module Properties
-    module Extensions
-      module Counters
-        def method_missing(*args, &block)
-          method_name = args.first.to_s
-
-          defined, result = if method_name.ends_with?('_bump!')
-                              define_property_method(method_name, '_bump!') do |property_name, object|
-                                _properties = object.properties
-                                _properties[property_name] = object.send("#{property_name}_count") + 1
-                                object.update_column(:properties, ActiveRecord::Coders::Hstore.new({}).dump(_properties))
-                                _properties[property_name]
-                              end
-                            else
-                              define_property_method(method_name, '_count') do |property_name, object|
-                                object.send("#{property_name}_property").to_i
-                              end
-                            end
-
-          defined ? result : super
-        end
-      end
-    end
-  end
-end