serial_preference 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54d18b94b81b67bd4f2a7e19c47f8f819c46f1d9
-  data.tar.gz: 4b31822a24f545b87e1893dc034c507899219bec
+  metadata.gz: db6bc7111161f864fadcbb7878a264501beb7514
+  data.tar.gz: 7d47f5fc3201e10311f6696e794698fa14d35640
 SHA512:
-  metadata.gz: 0f22e658f3cb638346a27474364c2515276e53bf7c79ab097348ad04313b7d6736f0fd433a8d75c066064e187c84a0046bd43ef06167c1caaac46676782ad549
-  data.tar.gz: d70a54b80d64763d1e5b5d78e6ef577f818de0ea2f82bc6765df2ce847506705aa104a081f71f23b811064f6d1980a5d440672420a3c617bf911f4c734e46a6f
+  metadata.gz: 20a7add6cc6780cfa01c4b30d948a4048c7e8870a1290720086c3defa51e7a9fb66cbf2a8e26076bd7397daf5d7c358953e19789df12b0f648e8aa1e5444541b
+  data.tar.gz: e9396b647dcf00583ff800c50ab1a362f830dc98125fb83729c191f3570c79f84eb82f065ae345d8fffc9b5a3e73288f7c4faed98fae7691e83a3d46f7188132

data/.travis.yml

@@ -0,0 +1,8 @@
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1
+  - 2.2
+  - ruby-head
+
+script: bundle exec rspec spec

data/README.md

@@ -79,6 +79,7 @@ Or install it yourself as:
 ````ruby
     # List of Preferences
     Company.preference_names # => [:income_ledger_id]
+````
 
 ## Contributing
 
@@ -87,3 +88,7 @@ Or install it yourself as:
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## Build Status
+
+* [![Build Status](https://travis-ci.org/asanghi/serial_preference.svg?branch=master)](https://travis-ci.org/asanghi/serial_preference)

data/lib/serial_preference/preference_definition.rb

@@ -10,7 +10,7 @@ module SerialPreference
       self.name = name.to_s
       opts.assert_valid_keys(:data_type,:default,:required,:field_type)
       self.data_type = @type = opts[:data_type] || :string
-      @column = ActiveRecord::ConnectionAdapters::Column.new(name.to_s,opts[:default],@type.to_s)
+      @column = ActiveRecord::ConnectionAdapters::Column.new(name.to_s, opts[:default], column_type(@type))
       self.default = opts[:default]
       self.required = !!opts[:required]
       self.field_type = opts[:field_type]
@@ -79,5 +79,27 @@ module SerialPreference
       end
     end
 
+    def column_type(type)
+      if rails_42?
+        case type
+        when :boolean
+          ActiveRecord::Type::Boolean.new
+        when :integer
+          ActiveRecord::Type::Integer.new
+        when :float
+          ActiveRecord::Type::Float.new
+        when :decimal
+          ActiveRecord::Type::Decimal.new
+        else
+          ActiveRecord::Type::String.new
+        end
+      else
+        type.to_s
+      end
+    end
+
+    def rails_42?
+      ActiveRecord::VERSION::MAJOR >= 4 && ActiveRecord::VERSION::MINOR == 2
+    end
   end
-end
+end

data/lib/serial_preference/version.rb

@@ -1,3 +1,3 @@
 module SerialPreference
-  VERSION = "1.1.4"
+  VERSION = "1.2.0"
 end

data/serial_preference.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "activerecord", ">= 3.0.0"
 
   gem.add_development_dependency 'sqlite3'
+  gem.add_development_dependency 'rspec', ">= 3.0.0"
   gem.add_development_dependency 'rspec-rails'
   gem.add_development_dependency "shoulda"
 

data/spec/has_preference_map_spec.rb

@@ -8,7 +8,7 @@ describe SerialPreference::HasSerialPreferences do
 
   context "default behaviour" do
     it "should return preferences as a default _preferences_attribute" do
-      DummyClass._preferences_attribute.should eq(:preferences)
+      expect(DummyClass._preferences_attribute).to eq(:preferences)
     end
     it "should return settings as a _preferences_attribute" do
       class OverriddenPreferenceAttributeClass < ActiveRecord::Base
@@ -17,21 +17,21 @@ describe SerialPreference::HasSerialPreferences do
           preference :abc
         end
       end
-      OverriddenPreferenceAttributeClass._preferences_attribute.should eq(:settings)
+      expect(OverriddenPreferenceAttributeClass._preferences_attribute).to eq(:settings)
     end
   end
 
   context "class methods behaviour" do
     it "should be possible to describe preference map thru preferences" do
-      DummyClass.respond_to?(:preferences).should be_true
+      expect(DummyClass.respond_to?(:preferences)).to be_truthy
     end
 
     it "should be possble to retrieve preference groups from class" do
-      DummyClass.respond_to?(:preference_groups).should be_true
+      expect(DummyClass.respond_to?(:preference_groups)).to be_truthy
     end
 
     it "should be possble to retrieve preference names from class" do
-      DummyClass.respond_to?(:preference_names).should be_true
+      expect(DummyClass.respond_to?(:preference_names)).to be_truthy
     end
   end
 
@@ -39,38 +39,38 @@ describe SerialPreference::HasSerialPreferences do
   context "should define accessors" do
     it "should have readers available" do
       d = DummyClass.new
-      d.respond_to?(:taxable).should be_true
-      d.respond_to?(:vat_no).should be_true
-      d.respond_to?(:max_invoice_items).should be_true
-      d.respond_to?(:income_ledger_id).should be_true
+      expect(d.respond_to?(:taxable)).to be_truthy
+      expect(d.respond_to?(:vat_no)).to be_truthy
+      expect(d.respond_to?(:max_invoice_items)).to be_truthy
+      expect(d.respond_to?(:income_ledger_id)).to be_truthy
     end
 
     it "should ensure that the readers returns the correct data" do
       d = DummyClass.new
       d.preferences = {:vat_no => "abc"}
-      d.vat_no.should eq("abc")
+      expect(d.vat_no).to eq("abc")
     end
 
     it "should have writers available" do
       d = DummyClass.new
-      d.respond_to?(:taxable=).should be_true
-      d.respond_to?(:vat_no=).should be_true
-      d.respond_to?(:max_invoice_items=).should be_true
-      d.respond_to?(:income_ledger_id=).should be_true
+      expect(d.respond_to?(:taxable=)).to be_truthy
+      expect(d.respond_to?(:vat_no=)).to be_truthy
+      expect(d.respond_to?(:max_invoice_items=)).to be_truthy
+      expect(d.respond_to?(:income_ledger_id=)).to be_truthy
     end
 
     it "should ensure that the writer write the correct data" do
       d = DummyClass.new
       d.vat_no = "abc"
-      d.vat_no.should eq("abc")
+      expect(d.vat_no).to eq("abc")
     end
 
     it "should ensure that the querier the correct data" do
       d = DummyClass.new
       d.taxable = true
-      d.should be_taxable
+      expect(d).to be_taxable
       d.taxable = false
-      d.should_not be_taxable
+      expect(d).to_not be_taxable
     end
 
     it "should have query methods available for booleans" do
@@ -78,13 +78,13 @@ describe SerialPreference::HasSerialPreferences do
     end
 
     it "should respond properly for default true preferences" do
-      DummyClass.new.taxable.should eq(true)
-      DummyClass.new.taxable?.should eq(true)
+      expect(DummyClass.new.taxable).to eq(true)
+      expect(DummyClass.new.taxable?).to eq(true)
     end
 
     it "should respond properly for default false preferences" do
-      DummyClass.new.creditable.should eq(false)
-      DummyClass.new.creditable?.should eq(false)
+      expect(DummyClass.new.creditable).to eq(false)
+      expect(DummyClass.new.creditable?).to eq(false)
     end
 
   end

data/spec/preference_definition_spec.rb

@@ -8,84 +8,84 @@ describe SerialPreference::PreferenceDefinition do
 
   it "should have proper accessors" do
     [:data_type, :name, :default, :required, :field_type].each do |a|
-      @blank_pref.respond_to?(a).should be_true
+      expect(@blank_pref.respond_to?(a)).to be_truthy
     end
   end
 
   it "should declare supported data types" do
-    described_class.constants.should include(:SUPPORTED_TYPES)
+    expect(described_class.constants).to include(:SUPPORTED_TYPES)
   end
 
   it "should stringify its name" do
-    described_class.new(:whatever).name.should eq("whatever")
+    expect(described_class.new(:whatever).name).to eq("whatever")
   end
 
   context "required behaviour" do
     it "should not be required when no required option provided" do
-      @blank_pref.should_not be_required
+      expect(@blank_pref).to_not be_required
     end
 
     it "should be required when required option is truthy" do
       [0,"yes","no","false",true].each do |truthy_values|
         p = described_class.new("whatever",{required: truthy_values})
-        p.should be_required
+        expect(p).to be_required
       end
     end
 
     it "should not be required when required option is falsy" do
       [false,nil].each do |falsy_values|
         p = described_class.new("whatever",{required: falsy_values})
-        p.should_not be_required
+        expect(p).to_not be_required
       end
     end
   end
 
   context "numericality behaviour" do
     it "should not be numerical when no data_type is provided" do
-      @blank_pref.should_not be_numerical
+      expect(@blank_pref).to_not be_numerical
     end
 
     it "should be numerical when data_type is numerical" do
       [:integer,:float,:decimal].each do |dt|
-        described_class.new("whatever",{data_type: dt}).should be_numerical
+        expect(described_class.new("whatever",{data_type: dt})).to be_numerical
       end
     end
 
     it "should be not numerical when data_type is non numerical" do
       [:string,:boolean,:password,:whatever].each do |dt|
-        described_class.new("whatever",{data_type: dt}).should_not be_numerical
+        expect(described_class.new("whatever",{data_type: dt})).to_not be_numerical
       end
     end
   end
 
   context "default behaviour" do
     it "should report correct name" do
-      @blank_pref.name.should eq("whatever")
+      expect(@blank_pref.name).to eq("whatever")
     end
     it "should be a string" do
-      @blank_pref.data_type.should eq(:string)
+      expect(@blank_pref.data_type).to eq(:string)
     end
     it "should have nil default" do
-      @blank_pref.default.should be_nil
+      expect(@blank_pref.default).to be_nil
     end
     it "should be false for required" do
-      @blank_pref.required.should be_false
+      expect(@blank_pref.required).to be_falsy
     end
     it "should have string field_type" do
-      @blank_pref.field_type.should eq(:string)
+      expect(@blank_pref.field_type).to eq(:string)
     end
   end
 
   context "field_type behaviour" do
     it "should report field_type as provided" do
-      described_class.new("whatever",{field_type: :xyz}).field_type.should eq(:xyz)
+      expect(described_class.new("whatever",{field_type: :xyz}).field_type).to eq(:xyz)
     end
     it "should report string for numerical data types" do
-      described_class.new("whatever",{data_type: :integer}).field_type.should eq(:string)
+      expect(described_class.new("whatever",{data_type: :integer}).field_type).to eq(:string)
     end
     it "should report data type for non numeric data types" do
       p = described_class.new("whatever",{data_type: :xyz})
-      p.field_type.should eq(p.data_type)
+      expect(p.field_type).to eq(p.data_type)
     end
   end
 
@@ -93,17 +93,17 @@ describe SerialPreference::PreferenceDefinition do
 
     context "when input is nil" do
       it "should report nil when no default is given" do
-        @blank_pref.value(nil).should be_nil
+        expect(@blank_pref.value(nil)).to be_nil
       end
 
       it "should report default when input is nil" do
         p = described_class.new("whatever",{default: "dog"})
-        p.value(nil).should eq("dog")
+        expect(p.value(nil)).to eq("dog")
       end
 
       it "should report default in appropriate data type when input is nil" do
         p = described_class.new("whatever",{default: "dog", data_type: :integer})
-        p.value(nil).should eq("dog".to_i)
+        expect(p.value(nil)).to eq("dog".to_i)
       end
     end
 
@@ -114,7 +114,7 @@ describe SerialPreference::PreferenceDefinition do
 
       it "should return correct strings as passthru" do
         ["",3.0,[],{},"dog",1].each do |input_val|
-          @preference.value(input_val).should eq(input_val.to_s)
+          expect(@preference.value(input_val)).to eq(input_val.to_s)
         end
       end
 
@@ -127,13 +127,13 @@ describe SerialPreference::PreferenceDefinition do
 
       it "should return correct integers" do
         ["",1,3.0,"dog"].each do |input_val|
-          @preference.value(input_val).should eq(input_val.to_i)
+          expect(@preference.value(input_val)).to eq(input_val.to_i)
         end
       end
 
       it "should report nil for non numeric input" do
         [[],{}].each do |input_val|
-          @preference.value(input_val).should be_nil
+          expect(@preference.value(input_val)).to be_nil
         end
       end
     end
@@ -145,13 +145,13 @@ describe SerialPreference::PreferenceDefinition do
 
       it "should return correct floats" do
         ["",1,3.0,"dog"].each do |input_val|
-          @preference.value(input_val).should eq(input_val.to_f)
+          expect(@preference.value(input_val)).to eq(input_val.to_f)
         end
       end
 
       it "should report nil for non numeric input" do
         [[],{}].each do |input_val|
-          @preference.value(input_val).should be_nil
+          expect(@preference.value(input_val)).to be_nil
         end
       end
     end
@@ -162,23 +162,23 @@ describe SerialPreference::PreferenceDefinition do
       end
       it "should report false for falsy values" do
         [nil,false].each do |falsy|
-          @preference.value(falsy).should be_false
+          expect(@preference.value(falsy)).to be_falsy
         end
       end
 
       it "should report false for false looking values" do
         [0,"0","false","FALSE","False","no","NO","No"].each do |falsy|
-          @preference.value(falsy).should be_false
+          expect(@preference.value(falsy)).to be_falsy
         end
       end
 
       it "should report true for truthy values" do
         ["yes",true,100,0.1,[],{}].each do |truthy_value|
-          @preference.value(truthy_value).should be_true
+          expect(@preference.value(truthy_value)).to be_truthy
         end
       end
     end
 
   end
 
-end
+end

data/spec/preferenzer_spec.rb

@@ -9,22 +9,22 @@ describe SerialPreference::Preferenzer do
 
   it "should have proper readers" do
     [:preference_groups,:preference,:preference_groups,:all_preference_definitions,:all_preference_names,:current_group].each do |a|
-      @preferenzer.should respond_to(a)
+      expect(@preferenzer).to respond_to(a)
     end
   end
 
   context "default instance behaviour" do
     it "should report empty preference groups" do
-      @preferenzer.preference_groups.should include(@base)
+      expect(@preferenzer.preference_groups).to include(@base)
     end
     it "should report current_contex to be nil" do
-      @preferenzer.current_group.should eq(@base)
+      expect(@preferenzer.current_group).to eq(@base)
     end
     it "should report all preference name to be empty" do
-      @preferenzer.all_preference_names.should be_empty
+      expect(@preferenzer.all_preference_names).to be_empty
     end
     it "should report all preference definitions to be empty" do
-      @preferenzer.all_preference_definitions.should be_empty
+      expect(@preferenzer.all_preference_definitions).to be_empty
     end
   end
 
@@ -32,23 +32,23 @@ describe SerialPreference::Preferenzer do
 
     it "should allow for addition of preference using pref" do
       @preferenzer.pref("whatever")
-      @preferenzer.all_preference_names.should include("whatever")
+      expect(@preferenzer.all_preference_names).to include("whatever")
     end
 
     it "should allow for addition of preference using preference" do
       @preferenzer.preference("whatever")
-      @preferenzer.all_preference_names.should include("whatever")
+      expect(@preferenzer.all_preference_names).to include("whatever")
     end
 
     it "should alias preference to pref" do
-      described_class.instance_method(:pref).should eq(described_class.instance_method(:preference))
+      expect(described_class.instance_method(:pref)).to eq(described_class.instance_method(:preference))
     end
 
     it "should allow for addition of preference group" do
       @preferenzer.preference_group(:new_group) do
         preference :new_preference
       end
-      @preferenzer.all_preference_names.should include("new_preference")
+      expect(@preferenzer.all_preference_names).to include("new_preference")
     end
 
   end
@@ -64,15 +64,15 @@ describe SerialPreference::Preferenzer do
           switch_off_hour default: 23
         end
       end
-      @preferenzer.all_preference_names.should include("age","name","sex","email","switch_off_hour")
+      expect(@preferenzer.all_preference_names).to include("age","name","sex","email","switch_off_hour")
     end
 
     it "should allow for addition of preference in given context" do
-      @preferenzer.all_groups.should_not include(:new_group)
+      expect(@preferenzer.all_groups).to_not include(:new_group)
       @preferenzer.preference_group(:new_group) do
         preference "addition"
       end
-      @preferenzer.all_preference_names.should include("addition")
+      expect(@preferenzer.all_preference_names).to include("addition")
     end
 
     it "should allow overriding of preference if defined twice" do
@@ -80,14 +80,14 @@ describe SerialPreference::Preferenzer do
         preference :overriding_name
         preference :overriding_name
       end
-      @preferenzer.all_preference_names.should include("overriding_name", "overriding_name")
+      expect(@preferenzer.all_preference_names).to include("overriding_name", "overriding_name")
     end
 
     it "should allow addition of preference to an existing preference group" do
       @preferenzer.preference_group(:notifications) do
         preference :new_preference
       end
-      @preferenzer.all_preference_names.should include("new_preference")
+      expect(@preferenzer.all_preference_names).to include("new_preference")
     end
 
     it "should allow for preference names to be strings or symbols" do
@@ -95,7 +95,7 @@ describe SerialPreference::Preferenzer do
         preference "string"
         preference :symbol
       end
-      @preferenzer.all_preference_names.should include("string", "symbol")
+      expect(@preferenzer.all_preference_names).to include("string", "symbol")
     end
 
     it "should allow for preference_group names to be strings or symbols" do
@@ -105,7 +105,7 @@ describe SerialPreference::Preferenzer do
       @preferenzer.preference_group("string") do
         preference :symbol
       end
-      @preferenzer.all_groups.should include("string", :symbol)
+      expect(@preferenzer.all_groups).to include("string", :symbol)
     end
   end
 end

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ $:.unshift File.expand_path('..', __FILE__)
 $:.unshift File.expand_path('../../lib', __FILE__)
 require 'active_support/all'
 require 'active_record'
+require 'yaml'
 require 'rspec'
 require 'shoulda'
 require "serial_preference/version"
@@ -11,7 +12,7 @@ require "serial_preference/has_preference_map"
 
 FIXTURES_DIR = File.join(File.dirname(__FILE__), "fixtures")
 config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
-ActiveRecord::Base.logger = ActiveSupport::BufferedLogger.new(File.dirname(__FILE__) + "/debug.log")
+ActiveRecord::Base.logger = ActiveSupport::Logger.new(File.dirname(__FILE__) + "/debug.log")
 ActiveRecord::Base.establish_connection(config['test'])
 
 RSpec.configure do |config|
@@ -21,4 +22,4 @@ def rebuild_model options = {}
   ActiveRecord::Base.connection.create_table :dummy_classes, :force => true do |table|
     table.column :preferences, :text
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serial_preference
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Aditya Sanghi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-14 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -89,6 +103,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md