contexts 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6b7149a89f0e5a6552c1087d1f58dd8bfa9967c
-  data.tar.gz: f61791aa859430bd5ab8e16f84f5838eef32635c
+  metadata.gz: 7e84208264b7a2f55fad385cfedaa7585f313378
+  data.tar.gz: 66c67a5a407c67712713b6eaf4cdeaaff6c0061e
 SHA512:
-  metadata.gz: 18affc6a95b04672cee4d80ee67b4f0ee7062d3abe0e362c90e90aa92ff2e245e4139c8bf52ea8cd3ee4df8cfa878060bc8e28c51b8fc1e07f892046c3e2db7e
-  data.tar.gz: a3443e921fba6200f3f68c09f80e0e1eb9d222f0f633c475eb0817eba6582dce34a55fc8a6692ddc4b183d4e0e52f0d343d44be1e40a45fb486f2cf9d23a3a2d
+  metadata.gz: d3ddb4bd3abc5bd907d8c7f1c73735b5e110e3b0d9d769e9bd9ae8b925758360dd9a16aa0c3a86647770115e73dd7c27b6651a8e51be3ea1b40dddcb82ba96a7
+  data.tar.gz: 039fc6ce21c2ff758faeb82a355027aa7bcb3b90455ef6e7946dec838595c4ec72cb987818cdca538d53c283698f46f609e52a251fa7bb578c7d3d1cb2a390d9

data/README.md

@@ -5,7 +5,7 @@
 
 # Contexts
 
-This gem provides simple way to reuse routes logic in rails apps.
+Simple way to reuse routes logic in Rails apps.
 
 ## Installation
 

data/lib/contexts.rb

@@ -2,8 +2,18 @@ require 'contexts/version'
 require 'mapper'
 
 module Contexts
+  def self.resolve(name)
+    if name.is_a?(Class)
+      name.new
+    else
+      "#{name}_context".classify.constantize.new
+    end
+  end
+
   def self.included(base)
     base.class_eval do
+      extend ClassMethods
+
       before_action :apply_contexts
 
       helper_method :contexts,
@@ -13,6 +23,14 @@ module Contexts
     end
   end
 
+  module ClassMethods
+    def preload_contexts(*names)
+      prepend_before_action do
+        names.each{ |name| contexts[name] ||= Contexts.resolve(name) }
+      end
+    end
+  end
+
   def contexts
     @contexts ||= (request.env['contexts'] || {})
   end

data/lib/contexts/version.rb

@@ -1,3 +1,3 @@
 module Contexts
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/lib/mapper.rb

@@ -11,8 +11,8 @@ module ActionDispatch::Routing
     end
 
     def context(name, &blk)
-      name = "#{name}_context".classify.constantize unless name.is_a?(Class)
-      ctx = name.new
+      ctx = Contexts.resolve(name)
+
       path = ":#{ctx.key}"
       path = "(#{path})" unless ctx.respond_to?(:required?) and ctx.required?
 

data/spec/controllers/context_preload_controller_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe ContextPreloadController, type: [:controller, :request] do
+  describe '.preload_contexts' do
+    it 'populates contexts' do
+      get '/'
+
+      expect(controller.current_context(:lang)).to eq(:en)
+      expect(controller.current_context(:city)).to eq(nil)
+    end
+  end
+end

data/spec/dummy/app/contexts/language_context.rb

@@ -8,7 +8,7 @@ class LanguageContext
   end
 
   def constraints
-    /ru|en/
+    Regexp.new(I18n.available_locales.join('|'))
   end
 
   def default

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

@@ -0,0 +1,3 @@
+class ContextPreloadController < ApplicationController
+  preload_contexts :language
+end

data/spec/dummy_app.rb

@@ -0,0 +1,25 @@
+ENV['RAILS_ENV'] = 'test'
+
+require 'rails'
+require 'action_controller/railtie'
+require 'rspec/rails'
+require 'contexts'
+
+module Dummy
+  class Application < Rails::Application
+    config.secret_key_base = 'dummy_key'
+    config.session_store :cookie_store, key: '_dummy_session'
+    config.eager_load = false
+
+    config.i18n.available_locales = [ :en, :ru ]
+    config.i18n.default_locale = :en
+  end
+end
+
+Rails.application.initialize!
+
+require 'dummy/app/contexts/language_context'
+require 'dummy/app/contexts/city_context'
+require 'dummy/app/controllers/application_controller'
+require 'dummy/app/controllers/context_preload_controller'
+require 'dummy/routes'

data/spec/spec_helper.rb

@@ -1,15 +1,7 @@
 require 'codeclimate-test-reporter'
 CodeClimate::TestReporter.start
 
-ENV['RAILS_ENV'] = 'test'
-
-require File.expand_path('../dummy/config/environment.rb',  __FILE__)
-require 'rspec/rails'
-
-require 'dummy/app/controllers/application_controller'
-require 'dummy/app/contexts/language_context'
-require 'dummy/app/contexts/city_context'
-require 'dummy/config/routes'
+require 'dummy_app'
 
 RSpec.configure do |config|
   config.order = 'random'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contexts
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Kolesnikov Danil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -113,13 +113,13 @@ files:
 - lib/contexts/version.rb
 - lib/mapper.rb
 - spec/controllers/application_controller_spec.rb
+- spec/controllers/context_preload_controller_spec.rb
 - spec/dummy/app/contexts/city_context.rb
 - spec/dummy/app/contexts/language_context.rb
 - spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/environment.rb
-- spec/dummy/config/routes.rb
+- spec/dummy/app/controllers/context_preload_controller.rb
+- spec/dummy/routes.rb
+- spec/dummy_app.rb
 - spec/spec_helper.rb
 homepage: https://github.com/kolesnikovde/contexts
 licenses:
@@ -147,11 +147,11 @@ specification_version: 4
 summary: Simple way to reuse routes logic in rails apps
 test_files:
 - spec/controllers/application_controller_spec.rb
+- spec/controllers/context_preload_controller_spec.rb
 - spec/dummy/app/contexts/city_context.rb
 - spec/dummy/app/contexts/language_context.rb
 - spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/environment.rb
-- spec/dummy/config/routes.rb
+- spec/dummy/app/controllers/context_preload_controller.rb
+- spec/dummy/routes.rb
+- spec/dummy_app.rb
 - spec/spec_helper.rb

data/spec/dummy/config/application.rb

@@ -1,21 +0,0 @@
-require File.expand_path('../boot', __FILE__)
-require 'action_controller/railtie'
-Bundler.require(*Rails.groups)
-require 'contexts'
-
-module Dummy
-  class Application < Rails::Application
-    config.secret_key_base = 'dummy_key'
-    config.session_store :cookie_store, key: '_dummy_session'
-    config.cache_classes = true
-    config.eager_load = false
-    config.consider_all_requests_local = true
-    config.action_dispatch.show_exceptions = false
-    config.action_controller.perform_caching = false
-    config.action_controller.allow_forgery_protection = false
-    config.active_support.deprecation = :stderr
-
-    config.i18n.available_locales = [ :en, :ru ]
-    config.i18n.default_locale = :en
-  end
-end

data/spec/dummy/config/boot.rb

@@ -1,5 +0,0 @@
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
-
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
-
-$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/dummy/config/environment.rb

@@ -1,3 +0,0 @@
-require File.expand_path('../application', __FILE__)
-
-Rails.application.initialize!