enju_leaf 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 689aa74d521ef467b8f7ffedf62d89e53a3eff85
-  data.tar.gz: 59d301030021945d636fa62b67dffec2039f8bb7
+  metadata.gz: 1a19950156f1ae98cf470312ee8dd334df219c9c
+  data.tar.gz: ff1a79ad1caab5220e3ccbc0481b112f095b04ef
 SHA512:
-  metadata.gz: 68a128ad91643369d17f6fc06922c2a71099103eb3890128fe3cb44b5fc1aa6a40dbce1a12a176d4e2cb30979eb7d244bef42112395d683849ceaff76487ffe1
-  data.tar.gz: 1f4dc0718ee60d18382d966aede3747fbbfa69dab8ba06a3089981ef1af709bbe9a87e20fe8b1b9a75827820b85dc3107560ae65c76630dd75a7ad5de8fc4a40
+  metadata.gz: 64be44e3fda46be17794e9ab49713adac4cb0d6c7d12f20033d19ac3d7a145836c712368f55ebc4a6ce5d6a9fc95d647cbc385543504d9890d2239b785295af9
+  data.tar.gz: 90b46ce054f8e7e73cf25286d6db022f267a096e08ee6d55c5e0ceb3da1c6743d437ac4ba7c85cde8e2a01c5be96f8da23127ffb7e7e6a8624b6b761e8cb7f45

data/lib/enju_leaf/version.rb

@@ -1,3 +1,3 @@
 module EnjuLeaf
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

data/lib/plugins/ext/mobylette/resolvers/chained_fallback_resolver.rb

@@ -0,0 +1,73 @@
+module Mobylette
+  module Resolvers
+    class ChainedFallbackResolver < ::ActionView::FileSystemResolver
+      DEFAULT_PATTERN = "{:path}/:prefix/:action{.:locale,}{.:formats,}{.:handlers,}"
+
+      # Initializes the fallback resolver with a default
+      # mobile format.
+      #
+      def initialize(formats = {}, view_paths = ['app/views'])
+        @fallback_formats = formats
+        @paths = view_paths.map { |view_path| File.expand_path(view_path)}
+        super(@paths.first, DEFAULT_PATTERN)
+      end
+
+      # Updates the fallback resolver replacing the
+      # fallback format hash.
+      #
+      # formats - hash of fallbacks, example:
+      #
+      #   formats = {
+      #     mobile: [:mobile, :html],
+      #     iphone: [:iphone, :ios, :mobile, :html],
+      #     android: [:android, :mobile],
+      #     ...
+      #   }
+      #
+      # It will add the fallback chain array of the 
+      # request.format to the resolver.
+      # 
+      # If the format.request is not defined in formats,
+      # it will behave as a normal FileSystemResovler.
+      #
+      def replace_fallback_formats_chain(formats)
+        @fallback_formats = formats
+      end
+
+      private
+
+      # Private: finds the right template on the filesystem,
+      #         using fallback if needed
+      #
+      def find_templates(name, prefix, partial, details, other = false)
+        # checks if the format has a fallback chain
+        if @fallback_formats.has_key?(details[:formats].first)
+          details = details.dup
+          details[:formats] = Array.wrap(@fallback_formats[details[:formats].first]) 
+        end
+        if other
+          super(name, prefix, partial, details, other)
+        else
+          super(name, prefix, partial, details)
+        end
+      end
+
+      # Helper for building query glob string based on resolver's pattern.
+      def build_query(path, details)
+        query = @pattern.dup
+
+        prefix = path.prefix.empty? ? "" : "#{escape_entry(path.prefix)}\\1"
+        query.gsub!(/\:prefix(\/)?/, prefix)
+
+        partial = escape_entry(path.partial? ? "_#{path.name}" : path.name)
+        query.gsub!(/\:action/, partial)
+
+        details.each do |ext, variants|
+          query.gsub!(/\:#{ext}/, "{#{variants.compact.uniq.join(',')}}")
+        end
+
+        query.gsub!(/\:path/, "#{@paths.compact.uniq.join(',')}")
+      end
+    end
+  end
+end

data/lib/plugins/ext/mobylette.rb

@@ -0,0 +1,2 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'mobylette', 'resolvers/chained_fallback_resolver'))
+

data/lib/plugins/ext.rb

@@ -1 +1,2 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'ext', 'sunspot'))
+require File.expand_path(File.join(File.dirname(__FILE__), 'ext', 'mobylette'))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_leaf
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-25 00:00:00.000000000 Z
+date: 2016-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -120,14 +120,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.14'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: paperclip-meta
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
@@ -316,14 +344,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -534,20 +562,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: annotate
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-activemodel-mocks
   requirement: !ruby/object:Gem::Requirement
@@ -898,6 +912,8 @@ files:
 - lib/generators/enju_leaf/setup/templates/solr/conf/solrconfig.xml
 - lib/plugins.rb
 - lib/plugins/ext.rb
+- lib/plugins/ext/mobylette.rb
+- lib/plugins/ext/mobylette/resolvers/chained_fallback_resolver.rb
 - lib/plugins/ext/sunspot.rb
 - lib/plugins/ext/sunspot/abstract_search.rb
 - lib/plugins/ext/sunspot/dismax.rb
@@ -1340,7 +1356,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Next-L Enju Leaf