arturo 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e275461050b9b145ee015ef8344c75c5acdaef28
-  data.tar.gz: 32ddd85665d038f1edf89a82542f85d8f321a3b0
+  metadata.gz: 4e9f81e2563e07812dc7a9b810dab0962f595d1e
+  data.tar.gz: df8febe2d13852e7ac498e6cf62ce3b7b9ac2223
 SHA512:
-  metadata.gz: 5fc9a22f85c3e363c4c5364181d655ba67b62018c6d7ec9dc93fbdfd5c46bfb53f3c41fb1839c97bf4f61d50c6903ecb2532bcae88f220ed71c6b8b17c6f5a9f
-  data.tar.gz: 69f0ca4bd8b469737eba1289b492250f8924b29cf84a729f171cf7f060236eafa868dbdf699491615d5a0601a54b33b81bfd2de56afd5d57cf3dfee82c45d0f5
+  metadata.gz: 130abc91076a6b2733c0e16e8f883a1244ac5ad860608eb6aa01f05eda9fc5c7e67e0cc704972e94c1f8714e6f93cd1513236072701ac30b14a0dcdf4183ca28
+  data.tar.gz: 635ddae0758b15185767ad4094f5d91f44828bb6cde56b8f85289f9ba52aebb72af04c89f74b7da126cd7b0f48390d139e501244f32c017e9dac59fc623a888d

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## v2.2.0
+
+Bug fix: making a feature-update request that fails strict params checks now returns a sensible error instead of throwing an exception
+
+Improvement: better failed-to-update error messages
+
+Support Matrix changes: add Rails 5.0, drop Rails 3.2, add Ruby 2.1.7, add Ruby 2.2.3, drop Ruby 1.9.3
+
+## v2.1.0
+
+Bug fix: `Arturo::SpecialHandling` always compares symbols as strings
+
+Improvmement: Rails 4.2 compatibility
+
+Improvement: relax minitest version constraints
+
+Improvement: add `set_feature!` method to complement `enable_feature!`and `disable_feature!`
+
 ## v2.0.0
 
 Bug fix: add missing require to initializer.

data/README.md

@@ -219,7 +219,7 @@ does not have the `:hold_book` feature.
     end
 
 `require_feature` accepts as a second argument a `Hash` that it passes on
-to `before_filter`, so you can use `:only` and `:except` to specify exactly
+to `before_action`, so you can use `:only` and `:except` to specify exactly
 which actions are filtered.
 
 If you want to customize the page that is rendered on 403 Forbidden

data/app/controllers/arturo/features_controller.rb

@@ -15,14 +15,13 @@ module Arturo
 
     unloadable
     respond_to :html, :json, :xml
-    before_filter :require_permission
-    before_filter :load_feature, :only => [ :show, :edit, :update, :destroy ]
 
-    if Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR == 0
-      def arturo_engine
-        self
-      end
-      helper_method :arturo_engine
+    if respond_to?(:before_action)
+      before_action :require_permission
+      before_action :load_feature, :only => [ :show, :edit, :update, :destroy ]
+    else
+      before_filter :require_permission
+      before_filter :load_feature, :only => [ :show, :edit, :update, :destroy ]
     end
 
     def index
@@ -80,7 +79,7 @@ module Arturo
         flash[:notice] = t('arturo.features.flash.updated', :name => @feature.to_s)
         redirect_to arturo_engine.feature_path(@feature)
       else
-        flash[:alert] = t('arturo.features.flash.error_updating', :name => @feature.to_s)
+        flash[:alert] = t('arturo.features.flash.error_updating', :name => @feature.name, :errors => @feature.errors.full_messages.join("\n"))
         render :action => 'edit'
       end
     end
@@ -110,4 +109,3 @@ module Arturo
   end
 
 end
-

data/config/locales/en.yml

@@ -35,7 +35,7 @@ en:
         created: "Created %{name}"
         error_creating: "Sorry, there was an error creating the feature."
         updated: "Updated %{name}"
-        error_updating: "Could not update feature #%{id}: %{errors}."
+        error_updating: "Could not update %{name}: %{errors}."
         removed: "Removed %{name}"
         error_removing: "Sorry, there was an error removing %{name}"
     no_such_feature:

data/config/routes.rb

@@ -1,13 +1,4 @@
-if Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR == 0
-  Rails.application.routes.draw do
-    scope "/arturo" do
-      resources :features, :controller => "arturo/features"
-      put 'features', :to => 'arturo/features#update_all', :as => 'features'
-    end
-  end
-else
-  Arturo::Engine.routes.draw do
-    resources :features, :controller => 'arturo/features'
-    put 'features', :to => 'arturo/features#update_all', :as => 'features_update_all'
-  end
+Arturo::Engine.routes.draw do
+  resources :features, :controller => 'arturo/features'
+  put 'features', :to => 'arturo/features#update_all', :as => 'features_update_all'
 end

data/lib/arturo.rb

@@ -4,7 +4,7 @@ module Arturo
   require 'arturo/feature_availability'
   require 'arturo/feature_management'
   require 'arturo/feature_caching'
-  require 'arturo/engine' if defined?(Rails) && Rails::VERSION::MAJOR >= 3
+  require 'arturo/engine' if defined?(Rails::VERSION::MAJOR) && Rails::VERSION::MAJOR >= 3
 
   class << self
     # Quick check for whether a feature is enabled for a recipient.

data/lib/arturo/controller_filters.rb

@@ -13,13 +13,14 @@ module Arturo
     end
 
     def on_feature_disabled(feature_name)
-      render :text => 'Forbidden', :status => 403
+      render (Rails::VERSION::MAJOR < 5 ? :text : :plain) => 'Forbidden', :status => 403
     end
 
     module ClassMethods
 
       def require_feature(name, options = {})
-        before_filter options do |controller|
+        method = respond_to?(:before_action) ? :before_action : :before_filter
+        send(method, options) do |controller|
           unless controller.feature_enabled?(name)
             controller.on_feature_disabled(name)
           end

data/lib/arturo/feature.rb

@@ -40,7 +40,7 @@ module Arturo
 
     # Create a new Feature
     def initialize(*args, &block)
-      args[0] = DEFAULT_ATTRIBUTES.merge(args[0] || {})
+      args[0] = DEFAULT_ATTRIBUTES.merge(args[0].try(:to_h) || {})
       super(*args, &block)
     end
 

data/lib/arturo/feature_caching.rb

@@ -18,9 +18,23 @@ module Arturo
   # to use a shared cache like Memcached.
   module FeatureCaching
 
+    module PrependMethods
+      # Wraps Arturo::Feature.to_feature with in-memory caching.
+      def to_feature(feature_or_symbol)
+        if !caches_features?
+          super
+        elsif feature_or_symbol.kind_of?(Arturo::Feature)
+          feature_or_symbol
+        else
+          symbol = feature_or_symbol.to_sym
+          feature_caching_strategy.fetch(feature_cache, symbol) { super(symbol) }
+        end
+      end
+    end
+
     def self.extended(base)
       class << base
-        alias_method_chain :to_feature, :caching
+        prepend PrependMethods
         attr_accessor :cache_ttl, :feature_cache, :feature_caching_strategy
       end
       base.send(:after_save) do |f|
@@ -35,18 +49,6 @@ module Arturo
       self.cache_ttl.to_i > 0
     end
 
-    # Wraps Arturo::Feature.to_feature with in-memory caching.
-    def to_feature_with_caching(feature_or_symbol)
-      if !caches_features?
-        to_feature_without_caching(feature_or_symbol)
-      elsif feature_or_symbol.kind_of?(Arturo::Feature)
-        feature_or_symbol
-      else
-        symbol = feature_or_symbol.to_sym
-        feature_caching_strategy.fetch(feature_cache, symbol) { to_feature_without_caching(symbol) }
-      end
-    end
-
     def warm_cache!
       warn "Deprecated, no longer necessary!"
     end

data/lib/arturo/feature_params_support.rb

@@ -18,14 +18,16 @@ module Arturo
       PERMITTED_ATTRIBUTES = [ :symbol, :deployment_percentage ]
 
       def feature_params
-        params.permit(:feature => PERMITTED_ATTRIBUTES)[:feature]
+        if feature = params[:feature]
+          feature.permit(PERMITTED_ATTRIBUTES)
+        end
       end
 
       def features_params
-        permitted = PERMITTED_ATTRIBUTES
         features = params[:features]
         features.each do |id, attributes|
-          features[id] = ActionController::Parameters.new(attributes).permit(*permitted)
+          attributes = attributes.to_unsafe_h if attributes.respond_to?(:to_unsafe_h)
+          features[id] = ActionController::Parameters.new(attributes).permit(*PERMITTED_ATTRIBUTES)
         end
       end
     end
@@ -35,4 +37,3 @@ module Arturo
   end
 
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arturo
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - James A. Rosen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2015-01-03 00:00:00.000000000 Z
+date: 2016-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -20,7 +20,7 @@ dependencies:
         version: '3.2'
     - - <
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '3.2'
     - - <
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -40,7 +40,7 @@ dependencies:
         version: '3.2'
     - - <
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
         version: '3.2'
     - - <
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -195,6 +195,24 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- LICENSE
+- README.md
+- app/assets/images/colon.png
+- app/assets/javascripts/arturo.js
+- app/assets/stylesheets/arturo.css
+- app/controllers/arturo/features_controller.rb
+- app/helpers/arturo/features_helper.rb
+- app/views/arturo/features/_feature.html.erb
+- app/views/arturo/features/_form.html.erb
+- app/views/arturo/features/edit.html.erb
+- app/views/arturo/features/forbidden.html.erb
+- app/views/arturo/features/index.html.erb
+- app/views/arturo/features/new.html.erb
+- app/views/arturo/features/show.html.erb
+- config/locales/en.yml
+- config/routes.rb
+- lib/arturo.rb
 - lib/arturo/controller_filters.rb
 - lib/arturo/engine.rb
 - lib/arturo/feature.rb
@@ -207,7 +225,6 @@ files:
 - lib/arturo/no_such_feature.rb
 - lib/arturo/special_handling.rb
 - lib/arturo/test_support.rb
-- lib/arturo.rb
 - lib/generators/arturo/assets_generator.rb
 - lib/generators/arturo/initializer_generator.rb
 - lib/generators/arturo/migration_generator.rb
@@ -215,23 +232,6 @@ files:
 - lib/generators/arturo/templates/arturo_customizations.css
 - lib/generators/arturo/templates/initializer.rb
 - lib/generators/arturo/templates/migration.rb
-- app/assets/images/colon.png
-- app/assets/javascripts/arturo.js
-- app/assets/stylesheets/arturo.css
-- app/controllers/arturo/features_controller.rb
-- app/helpers/arturo/features_helper.rb
-- app/views/arturo/features/_feature.html.erb
-- app/views/arturo/features/_form.html.erb
-- app/views/arturo/features/edit.html.erb
-- app/views/arturo/features/forbidden.html.erb
-- app/views/arturo/features/index.html.erb
-- app/views/arturo/features/new.html.erb
-- app/views/arturo/features/show.html.erb
-- config/locales/en.yml
-- config/routes.rb
-- README.md
-- CHANGELOG.md
-- LICENSE
 homepage: http://github.com/jamesarosen/arturo
 licenses:
 - APLv2
@@ -245,7 +245,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -253,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 2
 summary: Feature sliders, wrapped up in an engine