property_sets 0.1.0 → 0.1.1

data/Gemfile

@@ -2,8 +2,9 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 
-gem "activesupport", "~> 2.3.5"
-gem "activerecord", "~> 2.3.5"
+gem "activesupport", "2.3.10"
+gem "activerecord", "2.3.10"
+gem "actionpack", "2.3.10"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -1,6 +1,9 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    actionpack (2.3.10)
+      activesupport (= 2.3.10)
+      rack (~> 1.1.0)
     activerecord (2.3.10)
       activesupport (= 2.3.10)
     activesupport (2.3.10)
@@ -11,6 +14,7 @@ GEM
       git (>= 1.2.5)
       rake
     linecache (0.43)
+    rack (1.1.0)
     rake (0.8.7)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
@@ -23,8 +27,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 2.3.5)
-  activesupport (~> 2.3.5)
+  actionpack (= 2.3.10)
+  activerecord (= 2.3.10)
+  activesupport (= 2.3.10)
   bundler (~> 1.0.0)
   jeweler (~> 1.5.1)
   ruby-debug

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/property_sets.rb

@@ -1,6 +1,6 @@
-require 'property_sets/property_set_helper'
 require 'property_sets/property_set_model'
 require 'property_sets/active_record_extension'
+require 'property_sets/action_view_extension'
 
 module PropertySets
   def self.ensure_property_set_class(association, owner_class)

data/lib/property_sets/{property_set_helper.rb → action_view_extension.rb}

@@ -1,4 +1,5 @@
-require 'property_sets/form_builder_proxy'
+require 'action_view'
+require 'delegate'
 
 module ActionView
   module Helpers
@@ -17,12 +18,31 @@ module ActionView
   end
 
   class FormBuilder
+    class PropertySetFormBuilderProxy < Delegator
+      attr_accessor :builder
+      attr_accessor :property_set
+
+      def initialize(property_set, builder)
+        self.property_set = property_set
+        self.builder      = builder
+      end
+
+      def __getobj__
+        builder
+      end
+
+      def check_box(property, options = {}, checked_value = "1", unchecked_value = "0")
+        builder.property_set_check_box(property_set, property, options, checked_value, unchecked_value)
+      end
+    end
+
     def property_set(identifier)
-      PropertySets::FormBuilderProxy.new(identifier, self)
+      PropertySetFormBuilderProxy.new(identifier, self)
     end
 
     def property_set_check_box(property_set, property, options, checked_value, unchecked_value)
       @template.property_set_check_box(@object_name, property_set, property, objectify_options(options), checked_value, unchecked_value)
     end
   end
-end
+end
+

data/property_sets.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{property_sets}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Morten Primdahl"]
@@ -25,9 +25,8 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/property_sets.rb",
+    "lib/property_sets/action_view_extension.rb",
     "lib/property_sets/active_record_extension.rb",
-    "lib/property_sets/form_builder_proxy.rb",
-    "lib/property_sets/property_set_helper.rb",
     "lib/property_sets/property_set_model.rb",
     "property_sets.gemspec",
     "test/database.yml",
@@ -53,16 +52,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, ["~> 2.3.5"])
-      s.add_runtime_dependency(%q<activerecord>, ["~> 2.3.5"])
+      s.add_runtime_dependency(%q<activesupport>, ["= 2.3.10"])
+      s.add_runtime_dependency(%q<activerecord>, ["= 2.3.10"])
+      s.add_runtime_dependency(%q<actionpack>, ["= 2.3.10"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     else
-      s.add_dependency(%q<activesupport>, ["~> 2.3.5"])
-      s.add_dependency(%q<activerecord>, ["~> 2.3.5"])
+      s.add_dependency(%q<activesupport>, ["= 2.3.10"])
+      s.add_dependency(%q<activerecord>, ["= 2.3.10"])
+      s.add_dependency(%q<actionpack>, ["= 2.3.10"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
@@ -70,8 +71,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activesupport>, ["~> 2.3.5"])
-    s.add_dependency(%q<activerecord>, ["~> 2.3.5"])
+    s.add_dependency(%q<activesupport>, ["= 2.3.10"])
+    s.add_dependency(%q<activerecord>, ["= 2.3.10"])
+    s.add_dependency(%q<actionpack>, ["= 2.3.10"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.1"])

data/test/helper.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
-require 'test/unit'
 require 'active_support'
+require 'test/unit'
 require 'active_record'
 require 'active_record/fixtures'
 require 'shoulda'

data/test/test_property_sets.rb

@@ -172,7 +172,7 @@ class TestPropertySets < ActiveSupport::TestCase
     context "view construction" do
       should "provide a form builder proxy" do
         proxy = ActionView::FormBuilder.new.property_set(:foo)
-        assert proxy.is_a?(PropertySets::FormBuilderProxy)
+        assert proxy.is_a?(ActionView::FormBuilder::PropertySetFormBuilderProxy)
         assert_equal :foo, proxy.property_set
         proxy.builder.expects(:property_set_check_box).once.with(:foo, :bar, {}, "1", "0")
         proxy.check_box(:bar)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: property_sets
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Morten Primdahl
@@ -25,14 +25,14 @@ dependencies:
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 23
         segments: 
         - 2
         - 3
-        - 5
-        version: 2.3.5
+        - 10
+        version: 2.3.10
   requirement: *id001
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -41,20 +41,36 @@ dependencies:
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 23
         segments: 
         - 2
         - 3
-        - 5
-        version: 2.3.5
+        - 10
+        version: 2.3.10
   requirement: *id002
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
+  name: actionpack
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 3
+        - 10
+        version: 2.3.10
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
   name: shoulda
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -63,12 +79,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
   name: bundler
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -79,12 +95,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id004
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
   name: jeweler
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -95,12 +111,12 @@ dependencies:
         - 5
         - 1
         version: 1.5.1
-  requirement: *id005
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
   name: ruby-debug
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -109,12 +125,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id006
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
   name: thoughtbot-shoulda
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -123,7 +139,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id007
+  requirement: *id008
 description: This gem is an ActiveRecord extension which provides a convenient interface for managing per row properties
 email: morten@zendesk.com
 executables: []
@@ -142,9 +158,8 @@ files:
 - Rakefile
 - VERSION
 - lib/property_sets.rb
+- lib/property_sets/action_view_extension.rb
 - lib/property_sets/active_record_extension.rb
-- lib/property_sets/form_builder_proxy.rb
-- lib/property_sets/property_set_helper.rb
 - lib/property_sets/property_set_model.rb
 - property_sets.gemspec
 - test/database.yml

data/lib/property_sets/form_builder_proxy.rb

@@ -1,22 +0,0 @@
-require 'delegate'
-
-module PropertySets
-  class FormBuilderProxy < Delegator
-    attr_accessor :builder
-    attr_accessor :property_set
-
-    def initialize(property_set, builder)
-      self.property_set = property_set
-      self.builder      = builder
-    end
-
-    def __getobj__
-      builder
-    end
-
-    def check_box(property, options = {}, checked_value = "1", unchecked_value = "0")
-      builder.property_set_check_box(property_set, property, options, checked_value, unchecked_value)
-    end
-  end
-end
-