chanko 2.0.1 → 2.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b239416318a058952d59ce109343a369cc4fe3ea
+  data.tar.gz: 36a744a0b562fa16cd0864c6a87d16e1238ebe0a
+SHA512:
+  metadata.gz: 5ae4ded8653d633c7074486db302c3a45800bfb97a6ecd8b8bced4597bf2caf029f76ed8a12eee15945faf39c27b3ba1c292ac8e5a9b2f80b674d605ede31c80
+  data.tar.gz: 0a0cbb3b6f80ce06ae0e9e6c75649b66c526c4a8ea21222a96c3130dcee790014754d0fe65c813be8aeabd2dc5bb910b6ebca3161c0302fbd0aca96c80fcdfdc

data/.travis.yml

@@ -1,7 +1,7 @@
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
+  - 2.1.0
 branches:
   only:
     - master

data/Gemfile

@@ -5,13 +5,13 @@ gemspec
 group :development, :test, :production do
   gem "jquery-rails"
   gem "quiet_assets"
-  gem "rails", ">= 3.0.10"
+  gem "rails", ">= 4.0.0"
   gem "slim"
   gem "sqlite3"
 end
 
 group :test do
-  gem "rspec-rails", "2.12.2"
+  gem "rspec-rails", "2.14.0"
 end
 
 group :development, :test do
@@ -20,7 +20,7 @@ group :development, :test do
 end
 
 group :assets do
-  gem "sass-rails", ">= 3.0.10"
-  gem "coffee-rails", ">= 3.0.10"
+  gem "sass-rails"
+  gem "coffee-rails"
   gem "uglifier"
 end

data/README.md

@@ -1,6 +1,6 @@
 # Chanko [![Build Status](https://travis-ci.org/cookpad/chanko.png)](https://travis-ci.org/cookpad/chanko) [![Code Climate](https://codeclimate.com/github/cookpad/chanko.png)](https://codeclimate.com/github/cookpad/chanko) [![Coverage Status](https://coveralls.io/repos/cookpad/chanko/badge.png?branch=master)](https://coveralls.io/r/cookpad/chanko)
 
-http://cookpad.github.com/chanko/
+http://cookpad.github.io/chanko/
 
 Chanko provides a simple framework for rapidly and safely prototyping new
 features in your production Rails app, and exposing these prototypes to
@@ -13,7 +13,7 @@ it will be automatically hidden and fallback to its normal behavior.
 
 ## Requirements
 * Ruby >= 1.8.7
-* Rails >= 3.0.10
+* Rails >= 3.0.10 (and Rails4!)
 
 
 ## Usage

data/lib/chanko/active_if.rb

@@ -1,5 +1,8 @@
 module Chanko
   class ActiveIf
+    class NoConditionFound < StandardError
+    end
+
     class << self
       def define(label, &block)
         definitions[label] = block
@@ -18,10 +21,18 @@ module Chanko
       end
     end
 
-    attr_reader :conditions, :options
+    attr_reader :conditions
+
+    def options # remains just for backward compatibility
+      warn "ActiveIf#options is deprecated and is never used at #{caller[0]}"
+      @options
+    end
 
     def initialize(*conditions, &block)
       @options    = conditions.extract_options!
+      unless @options.empty?
+        warn "options in ActiveIf#new are deprecated and are never used at #{caller[0]}"
+      end
       @conditions = conditions
       @block      = block
     end
@@ -49,7 +60,11 @@ module Chanko
 
       def block
         condition = @conditions.first
-        condition.is_a?(Block) ? condition : ActiveIf.find(condition)
+        if condition.kind_of?(Block)
+          condition
+        else
+          ActiveIf.find(condition) or raise NoConditionFound, condition
+        end
       end
     end
 

data/lib/chanko/railtie.rb

@@ -1,11 +1,17 @@
 module Chanko
   class Railtie < Rails::Railtie
     initializer "chanko" do |app|
-      ::ActionView::Base.send(:include, Helper, Invoker, UnitProxyProvider)
-      ::ActionController::Base.send(:include, Controller, Invoker, UnitProxyProvider)
-      ::ActiveRecord::Base.send(:include, UnitProxyProvider)
-      ::ActiveRecord::Relation.send(:include, UnitProxyProvider)
-      ::ActiveRecord::Associations::CollectionAssociation.send(:include, UnitProxyProvider)
+      ActiveSupport.on_load :action_view do
+        ::ActionView::Base.send(:include, Helper, Invoker, UnitProxyProvider)
+      end
+      ActiveSupport.on_load :action_controller do
+        ::ActionController::Base.send(:include, Controller, Invoker, UnitProxyProvider)
+      end
+      ActiveSupport.on_load :active_record do
+        ::ActiveRecord::Base.send(:include, UnitProxyProvider)
+        ::ActiveRecord::Relation.send(:include, UnitProxyProvider)
+        ::ActiveRecord::Associations::CollectionAssociation.send(:include, UnitProxyProvider)
+      end
     end
   end
 end

data/lib/chanko/unit/scope_finder.rb

@@ -1,12 +1,6 @@
 module Chanko
   module Unit
     class ScopeFinder
-      LABEL_SCOPE_MAP = {
-        :controller => ActionController::Base,
-        :model      => ActiveRecord::Base,
-        :view       => ActionView::Base,
-      }
-
       def self.find(*args)
         new(*args).find
       end
@@ -34,7 +28,13 @@ module Chanko
       end
 
       def label
-        LABEL_SCOPE_MAP[@identifier]
+        label_scope_map = {
+          :controller => ActionController::Base,
+          :model      => ActiveRecord::Base,
+          :view       => ActionView::Base
+        }
+
+        label_scope_map[@identifier]
       end
     end
   end

data/lib/chanko/version.rb

@@ -1,3 +1,3 @@
 module Chanko
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/spec/chanko/deprecated_spec.rb

@@ -0,0 +1,27 @@
+require "spec_helper"
+
+module Chanko
+  describe ActiveIf do
+    around do |example|
+      origin, $stderr = $stderr, StringIO.new
+      example.run
+      $stderr = origin
+    end
+
+    describe ".new" do
+      context "with option arguments" do
+        it "prints warning message on standard error output" do
+          ActiveIf.new(foo: "bar")
+          $stderr.string.should =~ /\Aoptions in ActiveIf#new are deprecated and are never used at #{__FILE__}/
+        end
+      end
+    end
+
+    describe "#options" do
+      it "prints warning message on standard error output" do
+        ActiveIf.new.options
+        $stderr.string.should =~ /\AActiveIf#options is deprecated and is never used at #{__FILE__}/
+      end
+    end
+  end
+end

data/spec/chanko/logger_spec.rb

@@ -4,11 +4,17 @@ require "stringio"
 module Chanko
   describe Logger do
     around do |example|
-      origin, Rails.logger = Rails.logger, ::Logger.new(io)
+      origin, Rails.logger = Rails.logger, logger
       example.run
       Rails.logger = origin
     end
 
+    let(:logger) do
+      logger = ::Logger.new(io)
+      logger.formatter = lambda {|severity, time, progname, message| message }
+      logger
+    end
+
     let(:io) do
       StringIO.new
     end
@@ -87,7 +93,7 @@ module Chanko
       end
 
       it "does notihng" do
-        expect { described_class.debug(exception) }.not_to raise_error(NoMethodError)
+        expect { described_class.debug(exception) }.not_to raise_error
       end
     end
   end

data/spec/chanko/unit_spec.rb

@@ -50,6 +50,16 @@ module Chanko
             should be_false
           end
         end
+
+        context "when an undefined condition is specified" do
+          before do
+            unit.active_if(:this_is_not_a_condition)
+          end
+
+          specify "an undefined condition must raise NoConditionFound" do
+            expect { subject }.to raise_error Chanko::ActiveIf::NoConditionFound, /this_is_not_a_condition/
+          end
+        end
       end
 
       describe ".any" do
@@ -160,7 +170,7 @@ module Chanko
     end
 
     describe ".shared" do
-      it "stroes given block with given label" do
+      it "stores given block with given label" do
         unit.shared(:test) do
           "test"
         end

data/spec/dummy/app/controllers/entries_controller.rb

@@ -17,7 +17,7 @@ class EntriesController < ApplicationController
   end
 
   def create
-    @entry = Entry.create(params[:entry])
+    @entry = Entry.create(params[:entry].permit(:title, :body))
     redirect_to @entry
   end
 
@@ -27,7 +27,7 @@ class EntriesController < ApplicationController
 
   def update
     @entry = Entry.find(params[:id])
-    @entry.update_attributes(params[:entry])
+    @entry.update_attributes(params[:entry].permit(:title, :body))
     redirect_to @entry
   end
 end

data/spec/dummy/app/models/entry.rb

@@ -1,3 +1,2 @@
 class Entry < ActiveRecord::Base
-  attr_accessible :body, :deleted_at, :title
 end

data/spec/dummy/config/application.rb

@@ -1,15 +1,9 @@
 require File.expand_path('../boot', __FILE__)
 
-# Pick the frameworks you want:
-require "active_record/railtie"
-require "action_controller/railtie"
-require "action_mailer/railtie"
-require "active_resource/railtie"
-require "sprockets/railtie"
-# require "rails/test_unit/railtie"
+require "rails/all"
 
 if defined?(Bundler)
-  Bundler.require(*Rails.groups(:assets => %w(development test)))
+  Bundler.require(:default, Rails.env)
 end
 
 require "chanko"
@@ -52,15 +46,6 @@ module Dummy
     # like if you have constraints or database-specific column types
     # config.active_record.schema_format = :sql
 
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = true
-
-    # Enable the asset pipeline
-    config.assets.enabled = true
-
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
   end

data/spec/dummy/config/environments/development.rb

@@ -6,9 +6,6 @@ Dummy::Application.configure do
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
@@ -19,19 +16,8 @@ Dummy::Application.configure do
   # Print deprecation notices to the Rails logger
   config.active_support.deprecation = :log
 
-  # Only use best-standards-support built into browsers
-  config.action_dispatch.best_standards_support = :builtin
-
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
-
-  # Do not compress assets
-  config.assets.compress = false
-
   # Expands the lines which load the assets
   config.assets.debug = true
+
+  config.eager_load = false
 end

data/spec/dummy/config/environments/production.rb

@@ -64,4 +64,8 @@ Dummy::Application.configure do
   # Log the query plan for queries taking more than this (works
   # with SQLite, MySQL, and PostgreSQL)
   # config.active_record.auto_explain_threshold_in_seconds = 0.5
+
+  config.eager_load = true
+
+  config.assets.js_compressor = :uglifier
 end

data/spec/dummy/config/environments/test.rb

@@ -11,9 +11,6 @@ Dummy::Application.configure do
   config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
@@ -29,9 +26,8 @@ Dummy::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+
+  config.eager_load = false
 end

data/spec/dummy/config/initializers/secret_token.rb

@@ -5,3 +5,4 @@
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
 Dummy::Application.config.secret_token = '51ca37a6709156b59d667c092cd18abe392f137efb5e8be61287a5d38823e31d61470bb417098476092e5c53c52467e4a949163c6e78ce70e921ed928b39f9d8'
+Dummy::Application.config.secret_key_base = '24b191b073b60770ff32d8c0096a6786c8aa0c5f7c0968838f5321a0fbda49da3a567984ca3862f353b4cc408e1e23fedd1f3d808ae91965758239f19642a2e6'

metadata

@@ -1,100 +1,88 @@
 --- !ruby/object:Gem::Specification
 name: chanko
 version: !ruby/object:Gem::Version
-  version: 2.0.1
-  prerelease: 
+  version: 2.0.2
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-23 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.10
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.10
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -110,97 +97,85 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.10
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Chanko is a Rails extension tool
@@ -242,6 +217,7 @@ files:
 - lib/generators/chanko/unit/templates/unit.rb.erb
 - lib/generators/chanko/unit/unit_generator.rb
 - spec/chanko/controller_spec.rb
+- spec/chanko/deprecated_spec.rb
 - spec/chanko/exception_handler_spec.rb
 - spec/chanko/function_spec.rb
 - spec/chanko/helper_spec.rb
@@ -306,30 +282,30 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/cookpad/chanko
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rails extension tool
 test_files:
 - spec/chanko/controller_spec.rb
+- spec/chanko/deprecated_spec.rb
 - spec/chanko/exception_handler_spec.rb
 - spec/chanko/function_spec.rb
 - spec/chanko/helper_spec.rb