blue_print 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 206433cbd4ea20e4889db2b3925b82d6f133bd21
-  data.tar.gz: 37a77da96f4fd80e0646e084cc640c93530dbd60
+  metadata.gz: 36c078c9540643a1c92333bb69e1cff272152531
+  data.tar.gz: 333c4e5f2f455a7d9a40cc798f057a99533ddd5d
 SHA512:
-  metadata.gz: 2a94144f0ef54288803e77e932a9dc42e4bbcf621af214a4cb3a7d52c8108119758efe47107603d656a56e3d8ce65d6977ec4e5273b1ffa86e9d420859aacc89
-  data.tar.gz: 4aa19df93eb03d52a7ad5f17a214310339ac9f74fa0da8d65e30a2fe4bb9fce1e2857285fb37468b8dda7bc84576800c232a367ffa8ee87be2aefcf9d87d3dec
+  metadata.gz: d242609ed3a93872634e7fdd7955837972c96e7b3b4a0fde2e43c69583c81687e173b6a800dcc45da7c00211fdaf1aa3617e6874efb8bb755a175cfb37ecd6cf
+  data.tar.gz: 569938c8a3701fb2b0f0464e761fc24de4624d79df01b9bfec3a169cd3e251c196e96855bee4dac38800ef8e3b92a65462d8d975784e48e80679769bc4b5ad13

data/.travis.yml

@@ -15,6 +15,9 @@ matrix:
   allow_failures:
   - rvm: ruby-head
   - gemfile: gemfiles/rails-head.gemfile
+branches:
+  except:
+    - /^v([0-9]+\.){2}[0-9]+/
 script: bundle exec rspec
 notifications:
   slack:

data/README.md

@@ -21,7 +21,7 @@ The behavior switching framework. inspired by [DCI](http://en.wikipedia.org/wiki
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'blue_print', '~> 1.2.0'
+gem 'blue_print', '~> 1.3.0'
 ```
 
 ## Usage

data/Rakefile

@@ -13,11 +13,7 @@ task :benchmark do
     },
     benchmark_iteration: BENCHMARK_ITERATION,
     method_call_iteration: NUM_ITERATION,
-    benchmarks: {
-      pure: PURE_RESULT,
-      blue_print: BLUE_PRINT_RESULT,
-      extend: EXTEND_RESULT
-    }
+    benchmarks: SCORES
   }
 
   result[:benchmarks].each_pair do |label, scores|

data/benchmark/pure.rb

@@ -5,6 +5,37 @@ require 'benchmark'
 LABEL_WIDTH = 10
 BENCHMARK_ITERATION = 100
 NUM_ITERATION = 100000
+SCORES = Hash.new { |h, k| h[k] = [] }
+
+def benchmark(label, before_active, active, before_deactive, deactive)
+  progress = ProgressBar.create(
+    title: label.to_s.ljust(LABEL_WIDTH),
+    total: BENCHMARK_ITERATION
+  )
+  GC.start
+  BENCHMARK_ITERATION.times do |n|
+    n += 1
+
+    SCORES[label].push(
+      Benchmark.measure("#{n}#{n.ordinal}") do
+        before_active && before_active.call
+
+        NUM_ITERATION.times do
+          active.call
+        end
+
+        before_deactive && before_deactive.call
+
+        NUM_ITERATION.times do
+          deactive.call
+        end
+      end
+    )
+
+    progress.increment
+  end
+  progress.finish
+end
 
 class Model
   def self.active?
@@ -36,33 +67,12 @@ end
 
 model = Model.new
 
-PURE_RESULT = []
-progress = ProgressBar.create(
-  title: model.name.to_s.ljust(LABEL_WIDTH),
-  total: BENCHMARK_ITERATION
-)
-GC.start
-BENCHMARK_ITERATION.times do |n|
-  n += 1
+DEFAULT_CALL = -> { Model.new.name; NoEffect.new.name }
 
-  PURE_RESULT.push(
-    Benchmark.measure("#{n}#{n.ordinal}") do
-      Model.activate!
-
-      NUM_ITERATION.times do
-        Model.new.name
-        NoEffect.new.name
-      end
-
-      Model.deactivate!
-
-      NUM_ITERATION.times do
-        Model.new.name
-        NoEffect.new.name
-      end
-    end
-  )
-
-  progress.increment
-end
-progress.finish
+benchmark(
+  :pure,
+  -> { Model.activate! },
+  DEFAULT_CALL,
+  -> { Model.deactivate! },
+  DEFAULT_CALL
+)

data/benchmark/with_blue_print.rb

@@ -25,33 +25,10 @@ end
 
 model = Model.new
 
-BLUE_PRINT_RESULT = []
-progress = ProgressBar.create(
-  title: model.name.to_s.ljust(LABEL_WIDTH),
-  total: BENCHMARK_ITERATION
+benchmark(
+  :blue_print,
+  -> { BenchmarkContext.activate! },
+  DEFAULT_CALL,
+  -> { BenchmarkContext.deactivate! },
+  DEFAULT_CALL
 )
-GC.start
-BENCHMARK_ITERATION.times do |n|
-  n += 1
-
-  BLUE_PRINT_RESULT.push(
-    Benchmark.measure("#{n}#{n.ordinal}") do
-      BenchmarkContext.activate!
-
-      NUM_ITERATION.times do
-        Model.new.name
-        NoEffect.new.name
-      end
-
-      BenchmarkContext.deactivate!
-
-      NUM_ITERATION.times do
-        Model.new.name
-        NoEffect.new.name
-      end
-    end
-  )
-
-  progress.increment
-end
-progress.finish

data/benchmark/with_extend.rb

@@ -14,29 +14,10 @@ end
 
 model = Model.new.extend(ExtendedUser)
 
-EXTEND_RESULT = []
-progress = ProgressBar.create(
-  title: model.name.to_s.ljust(LABEL_WIDTH),
-  total: BENCHMARK_ITERATION
+benchmark(
+  :extended,
+  nil,
+  -> { Model.new.extend(ExtendedUser).name; NoEffect.new.name },
+  nil,
+  DEFAULT_CALL,
 )
-GC.start
-BENCHMARK_ITERATION.times do |n|
-  n += 1
-
-  EXTEND_RESULT.push(
-    Benchmark.measure("#{n}#{n.ordinal}") do
-      NUM_ITERATION.times do
-        Model.new.extend(ExtendedUser).name
-        NoEffect.new.name
-      end
-
-      NUM_ITERATION.times do
-        Model.new.name
-        NoEffect.new.name
-      end
-    end
-  )
-
-  progress.increment
-end
-progress.finish

data/lib/blue_print.rb

@@ -8,15 +8,17 @@ require 'blue_print/integration'
 require 'blue_print/railtie' if defined?(Rails)
 
 module BluePrint
+  ENV_KEY = :blue_print
+
   def self.env
-    Thread.current[:blue_print] ||= Thread.parents[:blue_print]
+    Thread.current[ENV_KEY] ||= Thread.parents[ENV_KEY]
   end
 
   def self.env=(env)
-    Thread.current[:blue_print] = env
+    Thread.current[ENV_KEY] = env
   end
 
   def self.clear!
-    Thread.current[:blue_print] = nil
+    Thread.current[ENV_KEY] = nil
   end
 end

data/lib/blue_print/helper.rb

@@ -5,9 +5,13 @@ module BluePrint::Helper
     context = BluePrint::Context.resolve(name_or_context)
 
     if context.active?
-      yield BluePrint.env
+      block_given? && yield(BluePrint.env)
     else
-      fallback.respond_to?(:call) && fallback.call
+      fallback.respond_to?(:call) && fallback.call(BluePrint.env)
     end
   end
+
+  def without_context_of(name_or_context, fallback = nil, &block)
+    within_context_of(name_or_context, block, &fallback)
+  end
 end

data/lib/blue_print/integration/action_controller.rb

@@ -25,6 +25,10 @@ module BluePrint::Integration::ActionController
   end
 end
 
+::ActionController::Base::MODULES.push(
+  BluePrint::Integration::ActionController
+)
+
 ::ActionController::Base.send(
   :include,
   BluePrint::Integration::ActionController

data/lib/blue_print/version.rb

@@ -1,3 +1,3 @@
 module BluePrint
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

data/lib/generators/rails/blue_print_generator.rb

@@ -20,7 +20,7 @@ module Rails
       def create_behavior_files
         each_with_role do |role|
           template 'role.rb', File.join(
-            'app/blue_prints', class_path, "#{file_name}_context", "#{role.downcase}.rb"
+            'app/blue_prints', class_path, "#{file_name}_context", "#{role.underscore}.rb"
           )
         end
       end

data/lib/generators/rspec/blue_print_generator.rb

@@ -13,7 +13,7 @@ module Rspec
     def create_behavior_files
       each_with_role do |role|
         template 'role_spec.rb', File.join(
-          'spec/blue_prints', class_path, "#{file_name}_context", "#{role.downcase}_spec.rb"
+          'spec/blue_prints', class_path, "#{file_name}_context", "#{role.underscore}_spec.rb"
         )
       end
     end

data/spec/lib/blue_print/helper_spec.rb

@@ -35,4 +35,37 @@ describe BluePrint::Helper do
       end
     end
   end
+
+  describe '#without_context_of' do
+    context 'with deactive context' do
+      let(:context) { double(active?: false) }
+
+      it 'runs block' do
+        helper.should_receive(:message).once
+        helper.without_context_of(context) do |env|
+          expect(env).to eq(BluePrint.env)
+          helper.message
+        end
+      end
+    end
+
+    context 'with active context' do
+      let(:context) { double(active?: true) }
+
+      it 'not runs block' do
+        helper.should_not_receive(:message)
+        helper.without_context_of(context) do
+          helper.message
+        end
+      end
+
+      it 'runs fallback' do
+        helper.should_receive(:fallback)
+        helper.should_not_receive(:message)
+        helper.without_context_of(context, proc { helper.fallback }) do
+          helper.message
+        end
+      end
+    end
+  end
 end

data/spec/lib/generators/rails/blue_print_generator_spec.rb

@@ -56,13 +56,13 @@ describe Rails::Generators::BluePrintGenerator do
   end
 
   context 'with Staff user:staff:customer' do
-    let(:arguments) { %w(Staff user:staff:customer) }
+    let(:arguments) { %w(Staff user:staff:customer_user) }
 
     specify 'be generated' do
       expect(destination_root).to(have_structure do
         directory 'app/blue_prints' do
           file 'staff_context.rb' do
-            contains 'cast ::User, as: [Staff, Customer]'
+            contains 'cast ::User, as: [Staff, CustomerUser]'
           end
 
           directory 'staff_context' do
@@ -70,7 +70,7 @@ describe Rails::Generators::BluePrintGenerator do
               contains 'StaffContext::Staff'
             end
 
-            file 'customer.rb' do
+            file 'customer_user.rb' do
               contains 'StaffContext::Customer'
             end
           end

data/spec/lib/generators/rspec/blue_print_generator_spec.rb

@@ -28,7 +28,7 @@ describe Rspec::BluePrintGenerator do
   end
 
   context 'with Staff user:staff:customer' do
-    let(:arguments) { %w(Staff user:staff:customer) }
+    let(:arguments) { %w(Staff user:staff:customer_user) }
 
     specify 'be generated' do
       expect(destination_root).to(have_structure do
@@ -37,8 +37,8 @@ describe Rspec::BluePrintGenerator do
             contains 'StaffContext::Staff'
           end
 
-          file 'customer_spec.rb' do
-            contains 'StaffContext::Customer'
+          file 'customer_user_spec.rb' do
+            contains 'StaffContext::CustomerUser'
           end
         end
       end)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blue_print
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Sho Kusano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-16 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler