simple_enum 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 788b09549df8143f67025e1c15785ccfcf6b2ff4
-  data.tar.gz: e1a274edb7723d4f9b354cdcae0f40179dba4a8b
+  metadata.gz: 3d9087e9c59c6e44c222f89f74e64ce59ddafa95
+  data.tar.gz: c0c6198ccfb33ef5073e13d8658ddf56f2f2674d
 SHA512:
-  metadata.gz: 24a99e865d791190a5468b67b40345438fd32eaf7973a3d08e176ad90ef0cce5dcd9dad9614df22bff5155e74ff1bc179b41aaed007e22a0ab530a584254adab
-  data.tar.gz: 70b69f2c0a4b1516485fba415fd62a492b680a0d4e5d09030ca2a27af790cb2a08d5f872860e399a0dca117f57384e3656eb3d6e6aa60eb61c9031b4aad0e55a
+  metadata.gz: 94d9588a9eaf13c492e0cafaca3b83e36692025c0c3e58cd23178dd0b130e364d959aceb3970292d64e38a48fd77390b12f15d704260819aa5a1c52ff2fb0602
+  data.tar.gz: 00ac3629cd9e0fb9f64691070a5150adf82edafa5be16d05621857e18c1278a469d0c3f4fdf7ffd165bea338e39c9ac6caf17e6ca4f41e132deff48333fdf8e6

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Lukas Westermann (Zurich, Switzerland)
+Copyright (c) 2015 Lukas Westermann (Zurich, Switzerland)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -246,6 +246,16 @@ so expect them to change in future versions of SimpleEnum.
   select :user, :gender_cd, enum_option_pairs(User, :gender, true)
   ```
 
+## Extensions
+
+`simple_enum` provides hooks to extend its functionality, starting with 2.3.0
+the following extensions can be used:
+
+- **Multi-select enum** support for SimpleEnum:
+  [simple_enum-multiple](https://github.com/bbtfr/simple_enum-multiple)
+- **Persistence values**, i.e. store values in the DB:
+  [simple_enum-persistence](https://github.com/bbtfr/simple_enum-persistence)
+
 ## Best practices
 
 Do not use values named after existing, or well known method names, like `new`, `create` etc.
@@ -277,11 +287,12 @@ Contributors
 - [@mhuggins](https://github.com/mhuggins) - translations fixes
 - [@patbenatar](https://github.com/patbenatar) - for helping move towards 2.0 (scopes et all)
 - [@abacha](https://github.com/abacha) - translation helpers, README fixes
+- [@bbtfr](https://github.com/bbtfr) - for support, ideas and pushing extensions
 - and all others: https://github.com/lwe/simple_enum/graphs/contributors thanks
 
 License & Copyright
 -------------------
 
-Copyright (c) 2011-2014 by Lukas Westermann, Licensed under MIT License (see LICENSE file)
+Copyright (c) 2011-2015 by Lukas Westermann, Licensed under MIT License (see LICENSE file)
 
 [VE.rb]: https://github.com/lwe/simple_enum/blob/master/lib/simple_enum/view_helpers.rb

data/Rakefile

@@ -5,11 +5,20 @@ require 'rake/testtask'
 Bundler::GemHelper.install_tasks
 
 desc 'Default: run all unit tests for both ActiveRecord & Mongoid.'
-task :default => :spec
+task :default => :'spec:all'
 
-desc 'Run rspec test suite'
-task :spec do
-  sh 'bundle exec rspec spec/'
+desc 'Run basic specs only (skips mongoid)'
+task :spec => :'spec:basic'
+
+namespace :spec do
+  desc 'Run all specs'
+  task :all do
+    sh 'bundle', 'exec', 'rspec', 'spec/'
+  end
+
+  task :basic do
+    sh 'bundle', 'exec', 'rspec', 'spec/', '-t', '~mongoid'
+  end
 end
 
 # Mongodb

data/lib/simple_enum/mongoid.rb

@@ -33,14 +33,16 @@ module SimpleEnum
       # Wrap method chain to create mongoid field and additional
       # column options
       def as_enum(name, values, options = {})
-        source = options[:source].to_s.presence || "#{name}#{SimpleEnum.suffix}"
         field_options = options.delete(:field)
+        enum = super
+        accessor = send("#{name.to_s.pluralize}_accessor")
+
         unless field_options === false
           field_options ||= SimpleEnum.field
-          field(source, field_options) if field_options
+          field(accessor.source, field_options) if field_options
         end
 
-        super
+        enum
       end
     end
   end

data/lib/simple_enum/version.rb

@@ -1,5 +1,5 @@
 module SimpleEnum
 
   # The current `SimpleEnum` version.
-  VERSION = "2.2.1"
+  VERSION = "2.3.0"
 end

data/spec/support/mongoid_support.rb

@@ -1,19 +1,46 @@
 require 'mongoid'
 
+# Hack to disable auto-retries for Mongo::Client - unless running
+# on Travis CI
+if ENV['CI'] && Mongoid.respond_to?(:default_client)
+  require 'mongo'
+
+  module Mongo
+    class Cluster
+      def scan!
+        raise ArgumentError, 'no retries please.'
+      end
+    end
+  end
+end
+
 module MongoidSupport
   def self.connection
-    @connection ||= begin
-      Mongoid.configure.connect_to("simple_enum_mongoid_test")
+    @connection_config ||= begin
+      Mongoid.configure do |config|
+        config.connect_to("simple_enum_mongoid_test", max_retries: ENV['CI'] ? 5 : 0)
+      end
+
+      # Disable client errors
+      Moped.logger.level = Logger::ERROR if defined?(Moped)
+      Mongo::Logger.logger.level = Logger::ERROR if defined?(Mongo)
+
+      # Return instance
+      return Mongoid.default_client if Mongoid.respond_to?(:default_client)
+      Mongoid.default_session
     end
-    Mongoid.default_client
   end
 
   def self.included(base)
     base.before {
       begin
-        MongoidSupport.connection.list_databases
-      rescue
-        skip "Start MongoDB server to run Mongoid integration tests..."
+        MongoidSupport.connection.database_names
+      rescue => e
+        if ENV['CI']
+          raise e
+        else
+          skip "Start MongoDB server to run Mongoid integration tests..."
+        end
       end
     }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_enum
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Lukas Westermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-14 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport