selections 0.2.1 → 0.2.2

data/CHANGELOG.md

@@ -1,5 +1,7 @@
-## 0.2.1
+## 0.2.2
+* https://github.com/nigelr/selections/pull/14 - Update selections to no longer use hash rocket syntax.
 
+## 0.2.1
 * Check the existence of the selections table in `belongs_to_selection` so it is safe to use during rake tasks like db:reset.
 
 ## 0.1.14 (should of been 0.2.0)

data/README.md

@@ -120,7 +120,7 @@ The selections method excepts all the standard Ruby on Rails form helper options
 If you have a selection named differently to the foreign key eg. the foreign key is variety_id, you can use a system_code option.
 
 ```ruby
-<%= f.selections :variety, :system_code => :category %>
+<%= f.selections :variety, system_code: :category %>
 ```
 
 ### Radio Buttons Options
@@ -199,7 +199,7 @@ Thanks to @mattconnolly
 In a new form the selections list will have blank top row unless a default item is set in the selections eg. Medium Priority, then there
 will be no blank row and the default item will be selected.
 
-When editing a form, by default the blank row will not be displayed. Use the options :include_blank => true option to overrided.
+When editing a form, by default the blank row will not be displayed. Use the options include_blank: true option to override.
 
 #### Archived Item
 

data/lib/generators/selections_scaffold/selections_scaffold_generator.rb

@@ -29,7 +29,7 @@ class SelectionsScaffoldGenerator < Rails::Generators::Base
 
     migration_template 'create_selections.rb', 'db/migrate/create_selections.rb'
 
-    route 'resources(:selections, :only => :index) { resources :selections, except: :show }'
+    route 'resources(:selections, only: :index) { resources :selections, except: :show }'
 
   end
 end

data/lib/selections/form_builder_extensions.rb

@@ -105,7 +105,7 @@ module Selections
       end
 
       def default_item
-        items.where(:is_default => true).first.try(:id).to_s
+        items.where(is_default: true).first.try(:id).to_s
       end
 
       def blank_content

data/lib/selections/selectable.rb

@@ -12,14 +12,14 @@ module Selections
         # Setup any required model information for a selectable model.
         acts_as_tree
 
-        validate :name, :existence => true
+        validate :name, existence: true
         validates_presence_of :name
-        validates_uniqueness_of :name, :scope => :parent_id
-        validates_uniqueness_of :system_code, :scope => :archived_at
+        validates_uniqueness_of :name, scope: :parent_id
+        validates_uniqueness_of :system_code, scope: :archived_at
         validates_format_of :system_code, :with => /^[a-z][a-zA-Z_0-9]*$/, :message => "can only contain alphanumeric characters and '_', not spaces"
 
-        before_validation :auto_gen_system_code, :on => :create
-        before_validation :disable_system_code_change, :on => :update
+        before_validation :auto_gen_system_code, on: :create
+        before_validation :disable_system_code_change, on: :update
         after_validation :check_defaults
 
         default_scope :order => [:position_value, :name]
@@ -43,9 +43,9 @@ module Selections
         # Selection.priorities => returns [high, medium, low] instances (children)
 
         def method_missing lookup_code, *options
-          if (scope = where(:system_code => lookup_code.to_s)).exists?
+          if (scope = where(system_code: lookup_code.to_s)).exists?
             scope.first
-          elsif (scope = where(:system_code => lookup_code.to_s.singularize)).exists?
+          elsif (scope = where(system_code: lookup_code.to_s.singularize)).exists?
             scope.first.children
           else
             super
@@ -118,7 +118,7 @@ module Selections
       end
 
       def siblings_with_default_set #:nodoc:
-        self.parent.children.where(:is_default => true).where("id != ?", self.id.to_i).first
+        self.parent.children.where(is_default: true).where("id != ?", self.id.to_i).first
       end
 
       def archived #:nodoc:

data/lib/selections/version.rb

@@ -1,3 +1,3 @@
 module Selections
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/spec/selections/selections_tag_spec.rb

@@ -318,8 +318,7 @@ describe SelectionTag do
         end
         it 'returns valid html' do
           ticket.update_attribute(:priority_id, selection_3.id)
-          #p edit_form(options: {:include_blank => true}, html_options: {class: 'fred'}).radio_tag
-          expect(edit_form(options: {:include_blank => true}, html_options: {class: 'fred'}).radio_tag).to eq "<label class=\"fred\" for=\"ticket_priority_id\"><input class=\"fred\" id=\"ticket_priority_id\" name=\"ticket[priority_id]\" type=\"radio\" />none</label><label class=\"fred\" for=\"ticket_priority_id_4\"><input checked=\"checked\" class=\"fred\" id=\"ticket_priority_id_4\" name=\"ticket[priority_id]\" type=\"radio\" value=\"4\" />high</label><label checked=\"checked\" class=\"fred\" for=\"ticket_priority_id_2\"><input class=\"fred\" id=\"ticket_priority_id_2\" name=\"ticket[priority_id]\" type=\"radio\" value=\"2\" />low</label><label class=\"fred\" for=\"ticket_priority_id_3\"><input class=\"fred\" id=\"ticket_priority_id_3\" name=\"ticket[priority_id]\" type=\"radio\" value=\"3\" />medium</label>"
+          expect(edit_form(options: {include_blank: true}, html_options: {class: 'fred'}).radio_tag).to eq "<label class=\"fred\" for=\"ticket_priority_id\"><input class=\"fred\" id=\"ticket_priority_id\" name=\"ticket[priority_id]\" type=\"radio\" />none</label><label class=\"fred\" for=\"ticket_priority_id_4\"><input checked=\"checked\" class=\"fred\" id=\"ticket_priority_id_4\" name=\"ticket[priority_id]\" type=\"radio\" value=\"4\" />high</label><label checked=\"checked\" class=\"fred\" for=\"ticket_priority_id_2\"><input class=\"fred\" id=\"ticket_priority_id_2\" name=\"ticket[priority_id]\" type=\"radio\" value=\"2\" />low</label><label class=\"fred\" for=\"ticket_priority_id_3\"><input class=\"fred\" id=\"ticket_priority_id_3\" name=\"ticket[priority_id]\" type=\"radio\" value=\"3\" />medium</label>"
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selections
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -157,7 +157,6 @@ files:
 - README.md
 - Rakefile
 - lib/generators/selections_scaffold/selections_scaffold_generator.rb
-- lib/generators/selections_scaffold/templates/.DS_Store
 - lib/generators/selections_scaffold/templates/_form.html.haml
 - lib/generators/selections_scaffold/templates/create_selections.rb
 - lib/generators/selections_scaffold/templates/edit.html.erb