flexible_enum 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 583e2cdd2195fcf2ad05ab12cd8732b4e6102852
-  data.tar.gz: 9baa69b13d1bfbd5ce44b5885c47de174ea505f5
+  metadata.gz: fd44f960187787c1fba3e7e58fc8a10797fb53a4
+  data.tar.gz: 3eb76c05d70ac78f139ba37adc28da37f1c19e77
 SHA512:
-  metadata.gz: 0480febf1a3dc4c81fcaa8e6b36304ed3e68f912b7340750ef38009f11e36583adbcddb37fc109476d5382fefe465f1499d01f023885fec194c4e3371f8baf22
-  data.tar.gz: f22e9e0d8754c3e99d24c223da23a1c686c92aa10e25fd25c1fef3be690b6e878c555edd4b355f0bc05d33f5803b99201dd50a9f8095c2d5bacdcb40cea9c9df
+  metadata.gz: a1bafc6bc31b3fffd78ed8009ad0f34f9042933ae1e51130e08da9e4477d2c5680c61fa095070dda03bf31a87ba1bb7468c7bf8de21af4195280d59c0b715473
+  data.tar.gz: 886b3797babe232b1d82c1c7be6267263c48b372af5db846a14760f5fa374795160a33945f9b77cc1e507b57ffa4d7ef9d13a83d0f7f8cd217b06c4c94bf3e65

data/CHANGELOG.md

@@ -1,6 +1,18 @@
 Current release (in development)
 --------------------------------
 
+* ...
+
+0.4.0
+-----
+
+*   Revert #4. Scopes provided by flexible_enum no longer attempt to overwrite pre-existing `WHERE` conditions on the enum column. #30
+
+    *Alex Robbin*
+
+0.3.0
+-----
+
 *   Adds `[option_name]_details` method to retrieve custom attributes of the
     current enum option. #24
 

data/README.md

@@ -202,6 +202,33 @@ CashRegister.drawer_position_opened # => CashRegister.where(drawer_position: 0)
 CashRegister.drawer_position_closed # => CashRegister.where(drawer_position: 1)
 ```
 
+### Note about default scopes
+
+Be careful when using default scopes on FlexibleEnum columns. Since FlexibleEnum provides scopes for enum values, setting a `default_scope` on a FlexibleEnum column will result in conflicts. For example, given this model:
+
+```ruby
+class User < ActiveRecord::Base
+  flexible_enum :status do
+    active 1
+    inactive 2
+  end
+
+  default_scope -> { where(status: ACTIVE) }
+end
+```
+
+Attempts to use the `User.inactive` scope that FlexibleEnum provides will result in this SQL:
+
+```sql
+SELECT * FROM users WHERE users.status = 1 AND users.status = 2
+```
+
+You will need to `unscope` the `default_scope` before using a FlexibleEnum-provided scope (as you would have to do for normal Rails scopes that happen to contradict each other).
+
+```ruby
+User.unscope(where: :status).inactive
+```
+
 ## Custom Options
 
 Configuration parameters passed to attribute options are saved even if they are unknown.
@@ -293,6 +320,19 @@ end
 
 Please see [CONTRIBUTING.md](https://github.com/meyouhealth/flexible_enum/blob/master/CONTRIBUTING.md).
 
+## Releasing
+
+* On master in a commit named `Version x.y.z` update [version.rb](lib/flexible_enum/version.rb) and [CHANGELOG.md](CHANGELOG.md) with the new version.
+
+* Run `rake release` to build and release to Rubygems.
+
+* Run `git push origin master --tags` to push master and the new tag (created automatically in previous step) to Github.
+
+* Create a Github release including the new change log entries in the description.
+
+* Thank contributors via Twitter.
+
+
 ## About MeYou Health
 
 ![http://meyouhealth.com/](https://avatars3.githubusercontent.com/u/249181?v=3&s=200)

data/lib/flexible_enum/scope_configurator.rb

@@ -5,7 +5,7 @@ module FlexibleEnum
 
       elements.each do |element_name, element_config|
         add_class_method(scope_name(element_name)) do
-          unscope(:where => configurator.attribute_name).where(configurator.attribute_name => element_config[:value])
+          where(configurator.attribute_name => element_config[:value])
         end
       end
     end

data/lib/flexible_enum/version.rb

@@ -1,3 +1,3 @@
 module FlexibleEnum
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/spec/scopes_spec.rb

@@ -17,11 +17,4 @@ describe "scopes" do
     expect(CashRegister.drawer_position_opened).to contain_exactly(opened)
     expect(CashRegister.drawer_position_closed).to contain_exactly(closed)
   end
-
-  it "builds scopes that aren't affected by default scopes" do
-    WithDefaultScope.new.tap(&:active!)
-    passive = WithDefaultScope.new.tap(&:passive!)
-
-    expect(WithDefaultScope.passive).to contain_exactly(passive)
-  end
 end

data/spec/spec_helper.rb

@@ -21,10 +21,6 @@ ActiveRecord::Schema.define do
     t.string   "manufacturer"
     t.integer  "drawer_position"
   end
-
-  create_table "with_default_scopes" do |t|
-    t.integer "status"
-  end
 end
 
 class CashRegister < ActiveRecord::Base
@@ -47,12 +43,3 @@ class CashRegister < ActiveRecord::Base
     sharp "SHCAY"
   end
 end
-
-class WithDefaultScope < ActiveRecord::Base
-  flexible_enum :status do
-    active  0
-    passive 1
-  end
-
-  default_scope { where(status: ACTIVE) }
-end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: flexible_enum
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Matt Daubert
 - Alex Robbin
 - Adam Prescott
 - Matthew Daubert
-- Sean Santry
 - Alex Robbin
+- Sean Santry
 - Chad Dressler
 - Adam Prescott
 - David Larrabee
 - Sean Santry
+- jon.zeppieri
 - David C. Goldhirsch
 - Guillermo Guerini
 - Matthew Daubert
-- jon.zeppieri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-12 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -127,16 +127,16 @@ email:
 - alex.robbin@meyouhealth.com
 - adam@aprescott.com
 - mdaubert@gmail.com
-- sean.santry@meyouhealth.com
 - alex@robbinsweb.biz
+- sean.santry@meyouhealth.com
 - chad@dresslerfamily.com
 - adam.prescott@meyouhealth.com
 - david.larrabee@meyouhealth.com
 - sean@seansantry.com
+- jon.zeppieri@meyouhealth.com
 - dgoldhirsch@yahoo.com
 - guillermo@gguerini.com
 - mdaubert+github@gmail.com
-- jon.zeppieri@meyouhealth.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Helpers for enum-like fields