classy_enum 3.3.2 → 3.4.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd8f827576d5863923d1700d81be95ccc85495a9
-  data.tar.gz: ba0b639734522273bc380f7f772a69e8c586d9db
+  metadata.gz: 39e6a9bb72f8a98c0517d42b6bf3d3dba7f7832e
+  data.tar.gz: 1ba0072e00fd99397f99c5fdc216f5866f0ef9a6
 SHA512:
-  metadata.gz: 9e6df9008d2535fb6e4ddc3ecf6f5aad2f37d849b2f18b6271c7a21542fd38883095e3d8cc9c60e42cfbc7903efc94e3cd7a45411f5eee4cc1d1a2627db9805f
-  data.tar.gz: b78ad295a389584f2a05a92e21b10759185bcec10168312dc7a90226c6329a3f727d68a0a8e6080f47b7290cb2bde8736cced605fa4d0d7f4c16eba90404f68b
+  metadata.gz: 1e2abe6cc896cfc7d681636fff656115e7f9d81407dcbeedfa90fec647e9b787564aa9a2da7065a7449dbb717f728bbab651a81f0f12ed4dcd5a0296b48614df
+  data.tar.gz: f5479eafdb914aa5feb877a7f51eebf786281414365dee10564e7c92b09e8d76e698cd3d2e0c08d8b0a127c59a5a52bca11d13efb51dd9b234a2ecd310bb44f0

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # ClassyEnum Changelog
 
+## 3.4.0
+
+* Removes full Rails gem dependency in favor of ActiveRecord
+
 ## 3.3.2
 
 * Fixes `rails destroy classy_enum MyEnum` for test unit

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2013 Peter Brown
+Copyright (c) 2010-2014 Peter Brown
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -25,7 +25,9 @@ See the [wiki](https://github.com/beerlington/classy_enum/wiki/Upgrading) for no
 
 ## Getting Started & Example Usage
 
-The most common use for ClassyEnum is to replace database lookup tables where the content and behavior is mostly static and has multiple "types". In this example, I have an Active Record model called `Alarm` with an attribute called `priority`. Priority is stored as a string (VARCHAR) type in the database and is converted to an enum value when requested.
+The most common use for ClassyEnum is to replace database lookup tables where the content and behavior is mostly static and has multiple "types". Please see the Wiki for a short discussion on use cases [comparing ClassyEnum to other gems](https://github.com/beerlington/classy_enum/wiki/ClassyEnum-vs-other-gems).
+
+In this example, I have an Active Record model called `Alarm` with an attribute called `priority`. Priority is stored as a string (VARCHAR) type in the database and is converted to an enum value when requested.
 
 ### 1. Generate the Enum
 
@@ -130,6 +132,19 @@ With this setup, I can now do the following:
 
 The enum field works like any other model attribute. It can be mass-assigned using `#update_attributes`.
 
+#### What if your enum class name is not the same as your model's attribute name?
+
+Just provide an optional `enum` argument to declare the attribute name. In this case, the model's attribute is called *alarm_priority*.
+
+```ruby
+class Alarm < ActiveRecord::Base
+  classy_enum_attr :alarm_priority, enum: 'Priority'
+end
+
+@alarm = Alarm.create(alarm_priority: :medium)
+@alarm.alarm_priority  # => Priority::Medium
+```
+
 ## Internationalization
 
 ClassyEnum provides built-in support for translations using Ruby's I18n
@@ -292,19 +307,6 @@ end
 @alarm.to_json.should == "{\"alarm\":{\"priority\":{}}}"
 ```
 
-## Special Cases
-
-What if your enum class name is not the same as your model's attribute name? No problem! Just use a second argument in `classy_enum_attr` to declare the attribute name. In this case, the model's attribute is called *alarm_priority*.
-
-```ruby
-class Alarm < ActiveRecord::Base
-  classy_enum_attr :alarm_priority, enum: 'Priority'
-end
-
-@alarm = Alarm.create(alarm_priority: :medium)
-@alarm.alarm_priority  # => Priority::Medium
-```
-
 ## Model Validation
 
 An Active Record validator `validates_inclusion_of :field, in: ENUM` is automatically added to your model when you use `classy_enum_attr`.
@@ -359,4 +361,4 @@ available but needs to be enabled manually. To enable support visit
 
 ## Copyright
 
-Copyright (c) 2010-2013 [Peter Brown](https://github.com/beerlington). See LICENSE for details.
+Copyright (c) 2010-2014 [Peter Brown](https://github.com/beerlington). See LICENSE for details.

data/classy_enum.gemspec

@@ -15,9 +15,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = ClassyEnum::VERSION
 
-  gem.add_dependency('rails', '>= 3.0')
+  gem.add_dependency('activerecord', '>= 3.0')
 
-  gem.add_development_dependency('rspec-rails', '>= 2.11')
+  gem.add_development_dependency('rspec', '>= 2.11')
   gem.add_development_dependency('sqlite3', '>= 1.3')
   gem.add_development_dependency('json', '>= 1.6')
   gem.add_development_dependency('debugger')

data/lib/classy_enum/base.rb

@@ -8,10 +8,21 @@ module ClassyEnum
     include Translation
     include Collection
 
-    class_attribute :base_class
     attr_accessor :owner, :serialize_as_json, :allow_blank
 
+    def base_class
+      self.class.base_class
+    end
+
     class << self
+      def base_class
+        @base_class ||= superclass.base_class
+      end
+
+      def base_class=(klass)
+        @base_class = klass
+      end
+
       def inherited(klass)
         return if klass.anonymous?
 

data/lib/classy_enum/collection.rb

@@ -26,6 +26,10 @@ module ClassyEnum
       index <=> other.index
     end
 
+    def enum_options
+      self.class.enum_options
+    end
+
     def self.included(klass)
       klass.extend ClassMethods
     end
@@ -36,7 +40,15 @@ module ClassyEnum
 
       def inherited(klass)
         if self == ClassyEnum::Base
-          klass.class_attribute :enum_options
+          klass.class_eval do
+            def self.enum_options
+              @enum_options ||= superclass.enum_options
+            end
+
+            def self.enum_options=(options)
+              @enum_options = options
+            end
+          end
           klass.enum_options = []
         else
           enum_options << klass

data/lib/classy_enum/version.rb

@@ -1,3 +1,3 @@
 module ClassyEnum
-  VERSION = "3.3.2"
+  VERSION = "3.4.0.beta1"
 end

data/spec/classy_enum/active_record_spec.rb

@@ -78,7 +78,10 @@ describe DefaultDog do
   context "with invalid breed options" do
     subject { DefaultDog.new(:breed => :fake_breed) }
     it { should_not be_valid }
-    it { should have(1).error_on(:breed) }
+    it 'has an error on :breed' do
+      subject.valid?
+      subject.errors[:breed].size.should eql(1)
+    end
   end
 end
 
@@ -95,7 +98,10 @@ describe "A ClassyEnum that allows blanks" do
   context "with invalid breed options" do
     subject { AllowBlankBreedDog.new(:breed => :fake_breed) }
     it { should_not be_valid }
-    it { should have(1).error_on(:breed) }
+    it 'has an error on :breed' do
+      subject.valid?
+      subject.errors[:breed].size.should eql(1)
+    end
   end
 end
 
@@ -112,7 +118,10 @@ describe "A ClassyEnum that allows nils" do
   context "with invalid breed options" do
     subject { AllowNilBreedDog.new(:breed => :fake_breed) }
     it { should_not be_valid }
-    it { should have(1).error_on(:breed) }
+    it 'has an error on :breed' do
+      subject.valid?
+      subject.errors[:breed].size.should eql(1)
+    end
   end
 end
 
@@ -137,7 +146,10 @@ describe ActiveDog do
         ActiveDog.create!(:name => 'Kitteh', :breed => :husky, :color => :black)
       end
 
-      it { should have(1).error_on(:name) }
+      it 'has an error on :name' do
+        subject.valid?
+        subject.errors[:name].size.should eql(1)
+      end
     end
   end
 

data/spec/classy_enum/base_spec.rb

@@ -55,6 +55,16 @@ describe ClassyEnum::Base do
       }.should raise_error(ClassyEnum::SubclassNameError)
     end
   end
+
+  context '#base_class' do
+    let(:base_class) { double }
+
+    it 'returns class base_class' do
+      enum = ClassyEnumBase.build(:two)
+      enum.class.base_class = base_class
+      enum.base_class.should == base_class
+    end
+  end
 end
 
 describe ClassyEnum::Base, 'Arel visitor' do

data/spec/classy_enum/collection_spec.rb

@@ -71,6 +71,18 @@ describe ClassyEnum::Collection do
       enum.select(&:odd?).should == [ClassyEnumCollection::One.new, ClassyEnumCollection::Three.new]
     end
   end
+
+  context '#enum_options' do
+    let(:options) { double }
+
+    before do
+      subject.enum_options = options
+    end
+
+    it 'returns class enum_options' do
+      subject.new.enum_options.should == options
+    end
+  end
 end
 
 describe ClassyEnum::Collection, Comparable do

data/spec/classy_enum_inheritance_spec.rb

@@ -1,25 +1,24 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 class ProjectTier < ClassyEnum::Base
-  class_attribute :inherited_properties
+  def self.hello
+    'world'
+  end
 end
 
 class ProjectTier::One < ProjectTier
-  self.inherited_properties = [1,2,3]
 end
 
 class ProjectTier::Two < ProjectTier::One
-  self.inherited_properties += [4,5,6]
 end
 
 describe 'Classy Enum inheritance' do
   it 'should inherit from the previous class' do
-    ProjectTier::One.inherited_properties.should eql([1,2,3])
-    ProjectTier::Two.inherited_properties.should eql([1,2,3,4,5,6])
+    ProjectTier::Two.hello.should eq(ProjectTier::One.hello)
   end
 
   it 'should instantiate the subclass' do
-    ProjectTier::Two.build(:two).should == ProjectTier::Two.new
+    ProjectTier.build(:two).should == ProjectTier::Two.new
   end
 
   it 'should have the right index' do

data/spec/spec_helper.rb

@@ -2,11 +2,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'rubygems'
-require 'rails'
 require 'active_record'
-require 'action_view'
-require 'action_controller'
-require 'rspec/rails'
 require 'classy_enum'
 
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: classy_enum
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.4.0.beta1
 platform: ruby
 authors:
 - Peter Brown
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-24 00:00:00.000000000 Z
+date: 2014-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.11'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A utility that adds class based enum functionality to ActiveRecord attributes
@@ -87,8 +87,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -133,17 +133,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: A class based enumerator utility for Ruby on Rails