hstore_radio_buttons 0.0.3 → 0.0.4

data/README.md

@@ -97,7 +97,7 @@ within the model itself.
     class Report < ActiveRecord::Base
       include HstoreRadioButtons
 
-      hstore_radio_button Hash['viewed' => ['true', 'false']]
+      hstore_radio_button Hash[viewed: ['true', 'false']]
       hstore_radio_button Hash['written by' => %w(monkeys interns milton)]
     end
 
@@ -235,33 +235,39 @@ And then do a render like:
 
     <%= f.label(:gender) %>
 or
+
     <%= f.hstore_radio_button(:gender) %>
 
 Then your button set will start with the label "Gender". But what if you
 want something else? Use the [Rails translations api](http://guides.rubyonrails.org/i18n.html#translations-for-active-record-models). So in your en.yml file, you could put:
 
-  en:
-    activerecord:
-      attributes:
-        person:
-          gender: "Please pick a gender"
+    en:
+      activerecord:
+        attributes:
+          person:
+            gender: "Please pick a gender"
 
 And your radio button set will render as:
 
-  Please pick a gender
-    o Male
-    o Female
-    o Other 
+    Please pick a gender
+      o Male
+      o Female
+      o Other 
 
-### Persistence
+## Persistence and Associations
 
 The conversion of your data into an hstore is handled by
 [activerecord-postgres-store]
 (https://github.com/engageis/activerecord-postgres-hstore) so refer to
 their documentation.
 
-Your data will be stored in the hstore_radio_data table. If you saved
-data for a Person with the id of 1, it will be saved as
+Any model that includes HstoreRadioButtons will have a has_one
+associaton with `hstore_radio_data`. This relationship will have
+`:autosave => true` 
+
+As you might guess from that association, your data will be stored in 
+the hstore_radio_data table. If you saved data for a Person with the 
+id of 1, it will be saved as
 
     model_id  model_type  hstore_data
     1         Person      {'gender' => 'other'....}
@@ -284,6 +290,7 @@ contributed by [Davin Lagerroos](https://github.com/davinlagerroos).
 
 ### Versions
 
+- 0.0.4 - Fixes issues: 1, 2
 - 0.0.3 - Added support to customize button-set labels with Rails Internationalization API
 - 0.0.2 - Fixes to inconsistency in how you call buttons by name.
 - 0.0.1 - Initial

data/lib/hstore_radio_buttons.rb

@@ -4,7 +4,7 @@ require 'active_support/dependencies/autoload'
 
 require 'hstore_radio_buttons/version'
 require 'hstore_radio_buttons/configuration'
-require 'hstore_radio_buttons/button_options'
+require 'hstore_radio_buttons/button_definition'
 require 'hstore_radio_buttons/button_set'
 require 'hstore_radio_buttons/method_namer'
 require 'hstore_radio_buttons/helpers/form_helper'
@@ -35,6 +35,6 @@ module HstoreRadioButtons
   private :hstore_data_proxy
 
   included do
-    has_one :hstore_radio_data, :class_name => 'HstoreRadioButtons::HstoreRadioData', :as => :model
+    has_one :hstore_radio_data, :class_name => 'HstoreRadioButtons::HstoreRadioData', :as => :model, :autosave => :true
   end
 end

data/lib/hstore_radio_buttons/button_definition.rb

@@ -0,0 +1,13 @@
+module HstoreRadioButtons
+  class ButtonDefinition
+    attr_reader   :options, :name
+
+    def name=(x)
+      @name = x.to_s
+    end
+
+    def options=(x)
+      @options = *x
+    end
+  end
+end

data/lib/hstore_radio_buttons/configuration.rb

@@ -13,14 +13,14 @@ module HstoreRadioButtons
       self.model = model
 
       if yaml_exists?
-        button_options_from_yaml.each {|button_options| HstoreRadioButtons::ButtonSet.new(button_options,model)}
+        button_defititions_from_yaml.each {|button_definition| build_button_from_definition(button_definition, model)}
       end
     end
 
     def _from_hash(model, raw_button_options)
       self.model = model
-      button_options = button_options_from_raw(raw_button_options)
-      HstoreRadioButtons::ButtonSet.new(button_options,model)
+      button_definition = create_button_definiton(raw_button_options)
+      build_button_from_definition(button_definition,model)
     end
 
   private
@@ -33,16 +33,23 @@ module HstoreRadioButtons
       File.exists?(yaml_file_location)
     end
 
-    def button_options_from_yaml
-      button_options = []
+    def button_defititions_from_yaml
+      button_definitions = []
       YAML.load(config_file)[model.to_s.downcase].each do |key, value|
-        button_options << button_options_from_raw(Hash[key,value])
+        button_definitions << create_button_definiton(Hash[key,value])
       end
-      button_options
+      button_definitions
     end
 
-    def button_options_from_raw(raw_button_options)
-      ButtonOptions.new(raw_button_options.keys.first, raw_button_options.values.first)
+    def create_button_definiton(raw_button_options)
+      b = ButtonDefinition.new
+      b.name = raw_button_options.keys.first
+      b.options = raw_button_options.values.first
+      b
+    end
+
+    def build_button_from_definition(button_definition,model)
+      HstoreRadioButtons::ButtonSet.new(button_definition,model)
     end
   end
 end

data/lib/hstore_radio_buttons/version.rb

@@ -1,3 +1,3 @@
 module HstoreRadioButtons
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/lib/hstore_radio_buttons/button_definition_test.rb

@@ -0,0 +1,31 @@
+require_relative '../../test_helper.rb'
+
+describe HstoreRadioButtons::ButtonDefinition do
+  before :each do
+    @it = HstoreRadioButtons::ButtonDefinition.new
+  end
+
+  describe "#name" do
+    it "returns a string when set to a string" do
+      @it.name = "string"
+      @it.name.must_equal "string"
+    end
+
+    it "returns a string when set to a symbol" do
+      @it.name = :symbol
+      @it.name.must_equal "symbol"
+    end
+  end
+
+  describe "#options" do
+    it "turns a single option into an array" do
+      @it.options = 1
+      @it.options.must_equal [1]
+    end
+
+    it "turns a null options into an array" do
+      @it.options = nil
+      @it.options.must_equal []
+    end
+  end
+end

data/test/lib/hstore_radio_buttons/configuration_test.rb

@@ -23,13 +23,13 @@ describe HstoreRadioButtons::Configuration do
         @it = Person.new
         config = YAML.load(File.open(@test_yaml_file_location))
         @button_sets = config[@it.class.to_s.downcase]
-        @button_option_double = HstoreRadioButtons::ButtonOptions.new('test',[])
-        HstoreRadioButtons::ButtonOptions.stubs(:new).returns(@button_option_double)
+        @button_definition = button_definition_double('test',[])
+        HstoreRadioButtons::ButtonDefinition.stubs(:new).returns(@button_definition)
       end
 
       it 'creates a button_set for each button set defined in the config file' do
         @button_sets.each do |button_set|
-          HstoreRadioButtons::ButtonSet.expects(:new).with(@button_option_double,@it.class).returns(nil)
+          HstoreRadioButtons::ButtonSet.expects(:new).with(@button_definition,@it.class).returns(nil)
         end
         HstoreRadioButtons::Configuration.from_yaml(Person, @test_yaml_file_location)
       end
@@ -39,19 +39,19 @@ describe HstoreRadioButtons::Configuration do
   describe "#from_hash" do
     describe "accepts a model and a button-defining hash to create a button" do
       it "creates a button_set for each button defined by a hstore_radio_button macro" do
-        class Report < ActiveRecord::Base; end
-        @button_option_double = HstoreRadioButtons::ButtonOptions.new('test',[])
-        HstoreRadioButtons::ButtonOptions.stubs(:new).returns(@button_option_double)
+        button_definition = button_definition_double(:viewed, ['true','false'])
+        HstoreRadioButtons::ButtonDefinition.expects(:new).returns(button_definition)
+        HstoreRadioButtons::ButtonSet.expects(:new).with(button_definition,Report)
 
-        HstoreRadioButtons::ButtonSet.expects(:new).with(@button_option_double,Report).twice.returns(nil)
-
-        class Report < ActiveRecord::Base
-          include HstoreRadioButtons
-
-          hstore_radio_button Hash['viewed' => ['true', 'false']]
-          hstore_radio_button Hash['written by' => %w(monkeys interns milton)]
-        end
+        HstoreRadioButtons::Configuration.from_hash(Report, Hash[viewed: ['true','false']])
       end
     end
   end
 end
+
+def button_definition_double(name, options)
+  b = HstoreRadioButtons::ButtonDefinition.new
+  b.name = name
+  b.options = options
+  b
+end

data/test/lib/hstore_radio_buttons/hstore_radio_buttons_test.rb

@@ -13,4 +13,8 @@ describe HstoreRadioButtons do
     Person.new.must_respond_to :hstore_radio_data
     Person.new.must_respond_to :build_hstore_radio_data
   end
+
+  it "sets autosave to true for the hstore_radio_data table" do
+    Person.reflect_on_association(:hstore_radio_data).options[:autosave].must_equal :true #yes, it is a symbol
+  end
 end

data/test/support/models.rb

@@ -4,3 +4,10 @@ class Person < ActiveRecord::Base
   hstore_radio_buttons './test/support/config/hstore_radio_button_sets.yml'
 end
 
+class Report < ActiveRecord::Base
+  include HstoreRadioButtons
+
+  hstore_radio_button Hash[viewed: ['true', 'false']]
+  hstore_radio_button Hash['written by' => %w(monkeys interns milton)]
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hstore_radio_buttons
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -157,14 +157,14 @@ files:
 - lib/generators/hstore_radio_buttons/migration/migration_generator.rb
 - lib/generators/hstore_radio_buttons/migration/templates/migration.rb
 - lib/hstore_radio_buttons.rb
-- lib/hstore_radio_buttons/button_options.rb
+- lib/hstore_radio_buttons/button_definition.rb
 - lib/hstore_radio_buttons/button_set.rb
 - lib/hstore_radio_buttons/configuration.rb
 - lib/hstore_radio_buttons/helpers/form_helper.rb
 - lib/hstore_radio_buttons/hstore_radio_data.rb
 - lib/hstore_radio_buttons/method_namer.rb
 - lib/hstore_radio_buttons/version.rb
-- test/lib/hstore_radio_buttons/button_options_test.rb
+- test/lib/hstore_radio_buttons/button_definition_test.rb
 - test/lib/hstore_radio_buttons/button_set_test.rb
 - test/lib/hstore_radio_buttons/configuration_test.rb
 - test/lib/hstore_radio_buttons/helpers/form_builder_test.rb
@@ -203,7 +203,7 @@ summary: Define a set of radio buttons for a model and then save the perisisted
   for these buttons in an hstore field. Good for data that you want to persist, but
   that isn't important enough for its own field in the model.
 test_files:
-- test/lib/hstore_radio_buttons/button_options_test.rb
+- test/lib/hstore_radio_buttons/button_definition_test.rb
 - test/lib/hstore_radio_buttons/button_set_test.rb
 - test/lib/hstore_radio_buttons/configuration_test.rb
 - test/lib/hstore_radio_buttons/helpers/form_builder_test.rb

data/lib/hstore_radio_buttons/button_options.rb

@@ -1,9 +0,0 @@
-module HstoreRadioButtons
-  class ButtonOptions
-    attr_accessor :name, :options
-    def initialize(name, options)
-      self.name = name
-      self.options = *options
-    end
-  end
-end

data/test/lib/hstore_radio_buttons/button_options_test.rb

@@ -1,15 +0,0 @@
-require_relative '../../test_helper.rb'
-
-describe HstoreRadioButtons::ButtonOptions do
-  describe "#options" do
-    it "turns a single option into an array" do
-      it = HstoreRadioButtons::ButtonOptions.new('test', 1)
-      it.options.must_equal [1]
-    end
-
-    it "turns a null options into an array" do
-      it = HstoreRadioButtons::ButtonOptions.new('test', nil)
-      it.options.must_equal []
-    end
-  end
-end