multiview 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e132d129c25fffcfa989a0dba045156cfe3bd6d
-  data.tar.gz: f959713516300b1a16987e233707fadb0bff4c0f
+  metadata.gz: a9c81beca7267f95b2d01112d07991f845bf6986
+  data.tar.gz: 11835b806d0724d21b91b3c72f4d6c74b3f749ed
 SHA512:
-  metadata.gz: 9a27e21c6b8cba2ebbf3041cb99c2e92aaa56b0f7b24a6086d584172fcd027502e2f6869cb57cec6121be56ae5af4da83fb7f74dd84dcd0df0b34db548818602
-  data.tar.gz: c909c6820c06a9d87dc820d92e8ea872962becb9cd48aa12a966ecd53976ff0d2b3d47ed35586e34fe2cc3d8e74555898d70e0651d53b97bc2c1ebeacc4248e8
+  metadata.gz: 74add043ec97f56b08796d66247bc79e0594a7fd47fc08d4e2759d686249f11dd49cfe0e388892df754200cdbefce4a83e848a8b992dea889051116d0d957066
+  data.tar.gz: c1373eb0e59c7780da535a4f3073437ddaa1043bdf564b928d2d5493386b36b79889892b3195998d49ba0a3f1128769c888911ca2bda5044562b967371ec096d

data/.gitignore

@@ -14,3 +14,4 @@
 spec/examples.txt
 
 *.swp
+*.gem

data/.travis.yml

@@ -1,5 +1,29 @@
-sudo: false
+sudo: enable
+dist: trusty
 language: ruby
+
+cache: bundler
+
 rvm:
-  - 2.2.6
-before_install: gem install bundler -v 1.15.1
+  - 2.1.10
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
+
+gemfile:
+  - gemfiles/rails-4.1
+  - gemfiles/rails-4.2
+  - gemfiles/rails-5.0
+  - gemfiles/rails-5.1
+
+matrix:
+  exclude:
+    - {rvm: '2.1.10', gemfile: 'gemfiles/rails-5.0'}
+    - {rvm: '2.1.10', gemfile: 'gemfiles/rails-5.1'}
+    - {rvm: '2.4.1', gemfile: 'gemfiles/rails-4.1'}
+
+before_install:
+  - gem install bundler --no-doc
+
+script: bundle exec rspec
+

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Jon Xie
+Copyright (c) 2017 Jiangzhi Xie
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -2,6 +2,8 @@
 
 Support multiple versions for Rails views
 
+[![Build Status](https://travis-ci.org/xiejiangzhi/multiview.svg?branch=master)](https://travis-ci.org/xiejiangzhi/multiview)
+
 
 ## Installation
 
@@ -18,7 +20,7 @@ And then execute:
 
 ## Usage
 
-### We project
+### Example Project
 
 `app/controllers/topics_controller.rb`
 
@@ -61,12 +63,13 @@ $multiview = Multiview::Manager.new({
 
 ### Redispatch request by filter of controller
 
-When get `/topics`, should redispatch to V2::TopicsController, don't call `TopicsController#index`, if we delete `V2::TopicsController` or change that config `{'topics' => 'v1'}`, it will call `TopicsController`
+When get `/topics`, should redispatch to `V2::TopicsController#index`, rether than `TopicsController#index`
+If delete `V2::TopicsController` or change that config `{'topics' => nil}`, it will call `TopicsController#index`
 
 ```
 class ApplicationController < ActionController::Base
   before_aciton :set_view_version_filter
-
+.
   def set_view_version_filter
     $multiview.redispatch(self)
 
@@ -75,7 +78,7 @@ class ApplicationController < ActionController::Base
 
     # if exist V3::XxxController, should to call V3::XxxController
     # if not, should to call XxxController and prepend v3 views path
-    # when you just want to change something for views, you should not to redefined a controller for the version
+    # when you only want to change something for views, you should not to create V3::XxxController for the version, just to make a view folder `app/views/v3/xxx`
     # $multiview.redispatch(self, params[:controller], params[:action], 'v3')
   end
 end
@@ -126,7 +129,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/multiview. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/xiejiangzhi/multiview. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 
@@ -134,4 +137,4 @@ The gem is available as open source under the terms of the [MIT License](http://
 
 ## Code of Conduct
 
-Everyone interacting in the Multiview project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/multiview/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Multiview project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/xiejiangzhi/multiview/blob/master/CODE_OF_CONDUCT.md).

data/gemfiles/rails-4.1

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in influx_orm.gemspec
+gemspec path: '../'
+
+gem 'rails', '~> 4.1.0'

data/gemfiles/rails-4.2

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in influx_orm.gemspec
+gemspec path: '../'
+
+gem 'rails', '~> 4.2.0'

data/gemfiles/rails-5.0

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in influx_orm.gemspec
+gemspec path: '../'
+
+gem 'rails', '~> 5.0.0'

data/gemfiles/rails-5.1

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in influx_orm.gemspec
+gemspec path: '../'
+
+gem 'rails', '~> 5.1.0'

data/lib/multiview/manager.rb

@@ -33,7 +33,8 @@ module Multiview
       version ||= find_version(controller_path)
       return unless version
 
-      if result = dispatch(controller.request.env, controller_path, action_name, version)
+      result = try_dispatch(controller.request.env, controller_path, action_name, version)
+      if result
         res = controller.response
         status, headers, body = result
         res.status = status
@@ -50,6 +51,7 @@ module Multiview
       versions_map[path.to_sym]
     end
 
+
     private
 
     def load_version_view(controller, version)
@@ -57,5 +59,10 @@ module Multiview
       Rails.logger.warn("[Multiview] Prepend view path app/views/#{version}")
       controller.prepend_view_path(Rails.root.join("app/views/#{version}"))
     end
+
+    def try_dispatch(env, path, action, version)
+      return if env['multiview']
+      dispatch(env, path, action, version)
+    end
   end
 end

data/lib/multiview/version.rb

@@ -1,3 +1,3 @@
 module Multiview
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multiview
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jon Xie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-05 00:00:00.000000000 Z
+date: 2017-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,6 +97,10 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- gemfiles/rails-4.1
+- gemfiles/rails-4.2
+- gemfiles/rails-5.0
+- gemfiles/rails-5.1
 - lib/multiview.rb
 - lib/multiview/manager.rb
 - lib/multiview/version.rb
@@ -121,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
 summary: Support multiple versions for Rails view.