dryml 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe6953ac6300bd2ae6cd905c6d7c32e62387c26f
-  data.tar.gz: ceeb9ad191a4040d66bf956a0e50dd15304d3f6d
+  metadata.gz: 1aeab80979d40c10f1851ed6397c5efc0b317e81
+  data.tar.gz: 0ad7025a6fdaa6acec287a9f2d5e177ca865f86b
 SHA512:
-  metadata.gz: 265f7067d269950326d1fc2f6b298a31aec61894b32b47a18e3ad74634059ab377aab99a8d1e50f8c13544a4f0979606e47cca47d1fbb7f13aa9d39017afe6ea
-  data.tar.gz: c2187c3594b67b9cab4ee9a85d4ca4318d24b3188bc1c39d90329456c4fa003b56dea1d205c4a8f75218844b241bdcc6365ecc57941c4e1fa928d6338b6c2ac1
+  metadata.gz: 6f7a2c5848da1614100fe5edd9d30dc052992e55d20a6920b40811870cc6862ece16c977c16c06d3a779512453f06301c9ac30ff754d465e714dead666848b33
+  data.tar.gz: 01d40482a3d61bb88999ea35eeebb9a74c8bc432874b570eb5de8b17360a1315e495c8c516e85044c211163f64ccdfd81f51b517b5940c6d7942fe290a149cee

data/Gemfile

@@ -6,4 +6,4 @@ gem 'hobo_support', :path => '../hobo_support'
 gemspec
 
 gem 'yard'
-
+gem 'rails', '4.0.8'

data/VERSION

@@ -1 +1 @@
-2.1.1
+2.1.2

data/dryml.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency('actionpack', ["~> 4.0.2"])
   s.add_runtime_dependency('hobo_support', ["= #{version}"])
-  s.add_development_dependency('rubydoctest', [">= 1.1.3"])
+  # s.add_development_dependency('rubydoctest', [">= 1.1.3"])
   s.add_development_dependency('cucumber', '~> 1.1.0')
   s.add_development_dependency('aruba', '~> 0.4.6')
 

data/lib/dryml/helper.rb

@@ -20,14 +20,16 @@ module Dryml::Helper
       # TODO: Calls to respond_to? in here can cause the full collection hiding behind a scoped collection to get loaded
       res = []
       empty = true
-      scope.new_scope(:repeat_collection => enum, :even_odd => 'odd', :repeat_item => nil) do
+      scope.new_scope(:repeat_collection => enum, :even_odd => 'odd', :repeat_item => nil, :index => 0) do
         if !enum.respond_to?(:to_a) && enum.respond_to?(:each_pair)
           enum.each_pair do |key, value|
             scope.repeat_item = value
             empty = false;
             self.this_key = key;
             new_object_context(value) { res << yield }
+            # The lines below are only used to prepare for the next element of the collection
             scope.even_odd = scope.even_odd == "even" ? "odd" : "even"
+            scope.index += 1
           end
         else
           index = 0
@@ -39,8 +41,10 @@ module Dryml::Helper
             else
               new_object_context(e) { res << yield }
             end
+            # The lines below are only used to prepare for the next element of the collection
             scope.even_odd = scope.even_odd == "even" ? "odd" : "even"
             index += 1
+            scope.index += 1
           end
         end
         Dryml.last_if = !empty

data/lib/dryml/template_environment.rb

@@ -44,11 +44,12 @@ module Dryml
             instance_variable_set(iv, view.instance_variable_get(iv))
           end
 
-          # Rails 4 hack.  Our method_missing hack doesn't get these because they're already (imporperly) defined.  Not sure why
-          self.assets_prefix = view.assets_prefix
-          self.assets_environment = view.assets_environment
-          self.assets_manifest = view.assets_manifest
-          self.digest_assets = view.digest_assets
+          # Copy some class attributes needed for Sprockets to work correctly
+          self.extend ::Sprockets::Rails::Helper
+          self.assets_prefix = view.try(:assets_prefix)
+          self.assets_environment = view.try(:assets_environment)
+          self.assets_manifest = view.try(:assets_manifest)
+          self.digest_assets = view.try(:digest_assets)
         end
       end
     end
@@ -641,6 +642,9 @@ module Dryml
       @view ? @view.session : {}
     end
 
+    def config
+      @view ? @view.config : {}
+    end
 
     def method_missing(name, *args, &b)
       if @view

data/test/dryml.rdoctest

@@ -3,6 +3,7 @@
         >> require 'active_support'
         >> require 'action_view'
         >> require 'action_controller'
+        >> require 'sprockets/railtie'
         >> $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '../../hobo_support/lib')
         >> $:.unshift File.join(File.expand_path(File.dirname(__FILE__)), '../../dryml/lib')
         >> require 'hobo_support'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dryml
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Tom Locke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2015-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -30,28 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.1
-- !ruby/object:Gem::Dependency
-  name: rubydoctest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement