selections 0.2.2 → 1.0.0

data/.gitignore

@@ -15,4 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-.idea/
+.idea/
+*.lock

data/.travis.yml

@@ -0,0 +1,15 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.1
+gemfile:
+  - gemfiles/3.2.gemfile
+  - gemfiles/4.0.gemfile
+  - gemfiles/4.1.gemfile
+
+matrix:
+  exclude:
+    # rails < 3.2 is unsupported on ruby 2.0
+    - rvm: 2.0.0
+      gemfile: gemfiles/3.2.gemfile

data/Appraisals

@@ -0,0 +1,14 @@
+appraise "3.2" do
+  gem "rails", "~> 3.2.15"
+  gemspec
+end
+
+appraise "4.0" do
+  gem "rails", "~> 4.0.0"
+  gemspec
+end
+
+appraise "4.1" do
+  gem "rails", "~> 4.1.0"
+  gemspec
+end

data/CHANGELOG.md

@@ -1,5 +1,9 @@
-## 0.2.2
+## 1.0.0
 * https://github.com/nigelr/selections/pull/14 - Update selections to no longer use hash rocket syntax.
+* https://github.com/nigelr/selections/pull/17 - Add rails 4 support, include appraisals gem and travis
+* https://github.com/nigelr/selections/pull/18 - Update readme to provide instructions on boot.rb 
+* https://github.com/nigelr/selections/pull/19 - Update generators for Rails 3 or 4
+* https://github.com/nigelr/selections/pull/20 - Return first default item in a group #13 
 
 ## 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.

data/README.md

@@ -29,6 +29,10 @@ Or install it yourself as:
 
     $ gem install selections
 
+Add this line to `config/boot.rb` under `require 'bundler/setup' ...` if using Rspec in your project
+
+    ENV["FIXTURES_PATH"] ||= 'spec/fixtures'
+
 ## Usage
 
 ### Generator
@@ -184,13 +188,17 @@ eg: show.html.erb
 Selections supports lookup using the boolean ? method, as an example:
 
 instead of needing to do
+
 ```ruby
   if @ticket.priority == Selection.ticket_priority_high
 ```
+
 you can check directly on the instance:
+
 ```ruby
   if @ticket.priority_high?
 ```
+
 Thanks to @mattconnolly
 
 ## Automatic Features
@@ -235,15 +243,15 @@ priority_high:
    name: Priorities
    system_code: priority_high
    parent: priority
-```   
+```
 ### In Factory
 Don't do this as it will need a DB lookup
 ```ruby
-  priority: { Selection.priority_high }     
+  priority: { Selection.priority_high }
 ```
 Do this as it will be much quicker
 ```ruby
- priority_id: { Selection.label_to_id(:priority_high) }    
+ priority_id: { Selection.label_to_id(:priority_high) }
 ```
 
 

data/Rakefile

@@ -1,3 +1,5 @@
+require "rubygems"
+require "bundler/setup"
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
 

data/gemfiles/3.2.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 3.2.15"
+gem "shoulda-matchers"
+gem "selections", :path => "../"
+
+gemspec :path => "../"

data/gemfiles/4.0.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.0.0"
+gem "shoulda-matchers"
+gem "selections", :path => "../"
+
+gemspec :path => "../"

data/gemfiles/4.1.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.1.0.beta"
+gem "shoulda-matchers"
+gem "selections", :path => "../"
+
+gemspec :path => "../"

data/lib/generators/selections_scaffold/selections_scaffold_generator.rb

@@ -14,7 +14,6 @@ class SelectionsScaffoldGenerator < Rails::Generators::Base
   def generate_selections_scaffold
     {
         'selection_spec.rb' => 'spec/models/',
-        'selection.rb' => 'app/models/',
         'selections_controller_spec.rb' => 'spec/controllers/',
         'selections_controller.rb' => 'app/controllers/',
         'selections_helper.rb' => 'app/helpers/',
@@ -27,9 +26,16 @@ class SelectionsScaffoldGenerator < Rails::Generators::Base
       copy_file file, dir + file
     end
 
+    model_source =
+        if ActiveRecord::VERSION::MAJOR >= 4
+          'selection.rb'
+        else
+          'selection_rails3.rb'
+        end
+    copy_file model_source, 'app/models/selection.rb'
+
     migration_template 'create_selections.rb', 'db/migrate/create_selections.rb'
 
     route 'resources(:selections, only: :index) { resources :selections, except: :show }'
-
   end
-end
+end

data/lib/generators/selections_scaffold/templates/selection.rb

@@ -1,5 +1,3 @@
 class Selection < ActiveRecord::Base
-  attr_accessible :archived, :is_default, :is_system, :name, :parent_id, :position_value, :system_code
-
   selectable
 end

data/lib/generators/selections_scaffold/templates/selection_rails3.rb

@@ -0,0 +1,5 @@
+class Selection < ActiveRecord::Base
+  attr_accessible :archived, :is_default, :is_system, :name, :parent_id, :position_value, :system_code
+
+  selectable
+end

data/lib/selections/selectable.rb

@@ -16,15 +16,15 @@ module Selections
         validates_presence_of :name
         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"
+        validates_format_of :system_code, :with => /\A[a-z][a-zA-Z_0-9]*\Z/, :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
         after_validation :check_defaults
 
-        default_scope :order => [:position_value, :name]
+        default_scope { order([:position_value, :name]) }
 
-        scope :filter_archived_except_selected, lambda { |selected_id| {:conditions => ["archived_at is ? or id = ?", nil, selected_id.to_i]} }
+        scope :filter_archived_except_selected, lambda { |selected_id| where(["archived_at is ? or id = ?", nil, selected_id.to_i]) }
       end
 
       module ClassMethods
@@ -73,7 +73,13 @@ module Selections
         # priority_id: { Selection.label_to_id(:priority_high) }    <== This will be much quicker
         #
         def label_to_id(label)
-          ActiveRecord::Fixtures.identify(label)
+          # ActiveRecord::FixtureSet replaces ActiveRecord::Fixtures in Rails 4
+          # This helps to ensure backwards compatibility
+          if ActiveRecord::VERSION::MAJOR >= 4
+            ActiveRecord::FixtureSet.identify(label)
+          else
+            ActiveRecord::Fixtures.identify(label)
+          end
         end
       end
 
@@ -136,6 +142,12 @@ module Selections
       def sub_children
         children.flat_map(&:children)
       end
+
+      # returns first default item in list e.g. Selection.priorities.default
+      def default
+        children.where(:is_default => true).order(:position_value).first
+      end
+
     end
 
     def selectable #:nodoc:

data/lib/selections/version.rb

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

data/selections.gemspec

@@ -26,13 +26,17 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'activerecord', '~> 3.0'
-  gem.add_dependency 'actionpack',   '~> 3.0'
-  gem.add_dependency 'acts_as_tree', '~> 1.2.0'
+  gem.add_dependency('activerecord', ">= 3.0")
+  gem.add_dependency('activesupport', ">= 3.0")
+  gem.add_dependency('actionpack', ">= 3.0")
+  gem.add_dependency 'acts_as_tree', '~> 1.6.0'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'appraisal'
   gem.add_development_dependency 'sqlite3'
   gem.add_development_dependency 'nokogiri'
-  gem.add_development_dependency "shoulda-matchers", "~> 2.4.0"
+  gem.add_development_dependency 'generator_spec'
+  gem.add_development_dependency 'minitest'
+  gem.add_development_dependency 'shoulda-matchers', ">= 2.4.0"
 end

data/spec/lib/generators/selections_scaffold_generator_spec.rb

@@ -0,0 +1,81 @@
+require 'spec_helper'
+require 'fileutils'
+require 'generator_spec'
+require 'generators/selections_scaffold/selections_scaffold_generator'
+
+describe SelectionsScaffoldGenerator do
+
+  destination File.expand_path("../../../../tmp", __FILE__)
+
+  before :all do
+    prepare_destination
+    # the generator requires the config/routes.rb file to exist. Let's create one:
+    create_routes_file
+    run_generator
+  end
+
+  def create_routes_file
+    @dir = self.class.test_case.destination_root
+    FileUtils.mkdir_p File.join(@dir, "config")
+    config = <<-EOF
+Some::Application.routes.draw do
+  root to: "home#index"
+end
+    EOF
+    File.write File.join(@dir, "config", "routes.rb"), config
+  end
+
+  def file_path(path)
+    File.join(@dir, path)
+  end
+
+  def file_contents(path)
+    File.read(file_path(path))
+  end
+
+  it "creates the routes" do
+    expect(file_contents('config/routes.rb')).to include("resources(:selections, only: :index) { resources :selections, except: :show }")
+  end
+
+  context "check files" do
+    %w[
+      app/controllers/selections_controller.rb
+      app/helpers/selections_helper.rb
+      app/models/selection.rb
+      app/views/selections/_form.html.haml
+      app/views/selections/edit.html.haml
+      app/views/selections/index.html.haml
+      app/views/selections/new.html.haml
+      config/routes.rb
+      spec/controllers/selections_controller_spec.rb
+      spec/fixtures/selections.yml
+      spec/models/selection_spec.rb
+  ].each do |file|
+      it "created #{file}" do
+        path = File.join(@dir, file)
+        expect(File.exist?(path)).to be_true
+      end
+    end
+  end
+
+  it "created one model" do
+    expect(Dir["#{@dir}/app/models/*.rb"].count).to eq(1)
+  end
+
+  it "creates a migration" do
+    expect(Dir["#{@dir}/db/migrate/*.rb"].count).to eq(1)
+  end
+
+  it "used the correct model" do
+    model = file_contents("app/models/selection.rb")
+    if ActiveRecord::VERSION::MAJOR == 3
+      expect(model).to include("attr_accessible")
+    else
+      expect(model).not_to include("attr_accessible")
+    end
+  end
+
+  it "created the routes" do
+    expect(file_contents('config/routes.rb')).to include("resources(:selections, only: :index) { resources :selections, except: :show }")
+  end
+end

data/spec/selections/selectable_spec.rb

@@ -40,10 +40,15 @@ describe Selections do
     end
   end
 
-  describe '#fixture_id' do
+  describe '#label_to_id' do
     context 'returns ID without DB access' do
-      it { expect(Selection.label_to_id('priority_high')).to eq ActiveRecord::Fixtures.identify(:priority_high) }
-      it { expect(Selection.label_to_id(:priority_high)).to eq ActiveRecord::Fixtures.identify(:priority_high) }
+      if ActiveRecord::VERSION::MAJOR >= 4
+        it { expect(Selection.label_to_id('priority_high')).to eq ActiveRecord::FixtureSet.identify(:priority_high) }
+        it { expect(Selection.label_to_id(:priority_high)).to eq ActiveRecord::FixtureSet.identify(:priority_high) }
+      else
+        it { expect(Selection.label_to_id('priority_high')).to eq ActiveRecord::Fixtures.identify(:priority_high) }
+        it { expect(Selection.label_to_id(:priority_high)).to eq ActiveRecord::Fixtures.identify(:priority_high) }
+      end
     end
   end
 
@@ -207,6 +212,26 @@ describe Selections do
     end
   end
 
+  describe "#default" do
+    context "returns default selection from list" do
+      before do
+        parent; selection_1; selection_2; selection_3;
+        selection_2.update_attribute(:is_default, true)
+      end
+      it { expect(Selection.priority.default).to eq(selection_2) }
+    end
+    context "returns nil if no children" do
+      before { parent }
+      it { expect(Selection.priority.default).to eq(nil) }
+    end
+    context "returns nil if none set as default" do
+      before do
+        parent; selection_1; selection_2; selection_3;
+      end
+      it { expect(Selection.priority.default).to eq(nil) }
+    end
+  end
+
   context "selecting" do
     before do
       selection_1

data/spec/selections/selections_tag_spec.rb

@@ -26,7 +26,13 @@ describe SelectionTag do
   let(:selection_1) { Selection.create(name: "low", parent_id: parent.id) }
   let(:selection_2) { Selection.create(name: "medium", parent_id: parent.id) }
   let(:selection_3) { Selection.create(name: "high", parent_id: parent.id) }
-  let(:form) { ActionView::Helpers::FormBuilder.new(:ticket, ticket, ActionView::Base.new, {}, Proc.new {}) }
+  if ActiveRecord::VERSION::MAJOR >= 4
+    let(:form) { ActionView::Helpers::FormBuilder.new(:ticket, ticket, ActionView::Base.new, {}) }
+    let(:form_user) { ActionView::Helpers::FormBuilder.new(:user, :user, ActionView::Base.new, {}) }
+  else
+    let(:form) { ActionView::Helpers::FormBuilder.new(:ticket, ticket, ActionView::Base.new, {}, Proc.new {}) }
+    let(:form_user) { ActionView::Helpers::FormBuilder.new(:user, :user, ActionView::Base.new, {}, Proc.new {}) }
+  end
   let(:ticket) { Ticket.create(:name => "railscamp") }
   let(:all_selections) do
     parent
@@ -45,7 +51,7 @@ describe SelectionTag do
         before { model_parent }
         it("should find more explicit route of model parent") { expect(edit_form.system_code).to eq(model_parent) }
         it "should use priority system_code when model is not ticket" do
-          expect(edit_form(form: ActionView::Helpers::FormBuilder.new(:user, :user, ActionView::Base.new, {}, Proc.new {})).system_code).to eq(parent)
+          expect(edit_form(form: form_user ).system_code).to eq(parent)
         end
       end
     end
@@ -68,7 +74,7 @@ describe SelectionTag do
     before { all_selections }
 
     it "returns all children items" do
-      expect(edit_form.items.all).to eq(parent.children)
+      expect(edit_form.items.to_a).to eq(parent.children)
     end
     context "archived" do
       before { selection_2.update_attribute(:archived, "1") }
@@ -77,7 +83,7 @@ describe SelectionTag do
       end
       it "returns archived items when selected" do
         ticket.update_attribute(:priority_id, selection_2.id)
-        expect(edit_form.items.all).to eq(parent.children)
+        expect(edit_form.items.to_a).to eq(parent.children)
       end
     end
   end

data/spec/spec_helper.rb

@@ -2,6 +2,11 @@ require 'selections'
 require "nokogiri"
 require 'active_record/fixtures'
 
+if ActiveRecord::VERSION::MAJOR == 3
+  # Rails 3 has some big warning that prints out if this is not there, but this will break Rails 4. :(
+  require 'minitest'
+end
+
 ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
 ActiveRecord::Migration.create_table :selections do |t|
   t.string :name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selections
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,14 +9,14 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
@@ -24,7 +24,23 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
@@ -32,7 +48,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
@@ -40,7 +56,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
@@ -50,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  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: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -123,12 +155,44 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: generator_spec
+  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: minitest
+  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: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.4.0
   type: :development
@@ -136,7 +200,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.4.0
 description: ! "Selection list management and form and view helpers.\n Manages one
@@ -151,11 +215,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/3.2.gemfile
+- gemfiles/4.0.gemfile
+- gemfiles/4.1.gemfile
 - lib/generators/selections_scaffold/selections_scaffold_generator.rb
 - lib/generators/selections_scaffold/templates/_form.html.haml
 - lib/generators/selections_scaffold/templates/create_selections.rb
@@ -166,6 +235,7 @@ files:
 - lib/generators/selections_scaffold/templates/new.html.erb
 - lib/generators/selections_scaffold/templates/new.html.haml
 - lib/generators/selections_scaffold/templates/selection.rb
+- lib/generators/selections_scaffold/templates/selection_rails3.rb
 - lib/generators/selections_scaffold/templates/selection_spec.rb
 - lib/generators/selections_scaffold/templates/selections.yml
 - lib/generators/selections_scaffold/templates/selections_controller.rb
@@ -177,6 +247,7 @@ files:
 - lib/selections/selectable.rb
 - lib/selections/version.rb
 - selections.gemspec
+- spec/lib/generators/selections_scaffold_generator_spec.rb
 - spec/selections/belongs_to_selection_spec.rb
 - spec/selections/selectable_spec.rb
 - spec/selections/selections_tag_spec.rb
@@ -209,6 +280,7 @@ summary: Selection list management and form and view helpers. Manages one table
   or children ( eg. Selection.priorities ). Form helper to display lists ( eg. f.selections
   :priorities ). Handling of archived items ( displaying if selected only ).
 test_files:
+- spec/lib/generators/selections_scaffold_generator_spec.rb
 - spec/selections/belongs_to_selection_spec.rb
 - spec/selections/selectable_spec.rb
 - spec/selections/selections_tag_spec.rb