dryml 2.0.1 → 2.1.0.pre1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e227b41c5836dad5d8ca4b3bad11e08fd205fa4a
+  data.tar.gz: e40950a5d94b8daefdcaa7e28d432818a64c05ac
+SHA512:
+  metadata.gz: 352912d8cd8ef48121aae28cbeaba2937d7f23a4ff1aef4a413f0439b77b3d4ee4158e7e7a1730292d8e759a4734b3289b97658329b2b7ecaf27248274a72e06
+  data.tar.gz: c64f26f4b59a9b5aee4a0055570b5b15bf74bd0ec94a65b773c9166b426206e2effee9a4b1759b4a28eb64b702cf6394d738da6252ae77c7f8d6e03899e1889b

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.1.0.pre1

data/dryml.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.summary = "The Don't Repeat Yourself Markup Language"
   s.description = "The Don't Repeat Yourself Markup Language"
 
-  s.add_runtime_dependency('actionpack', ["~> 3.2.0"])
+  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('cucumber', '~> 1.1.0')

data/lib/dryml/helper.rb

@@ -21,7 +21,7 @@ module Dryml::Helper
       res = []
       empty = true
       scope.new_scope(:repeat_collection => enum, :even_odd => 'odd', :repeat_item => nil) do
-        if enum.respond_to?(:each_pair)
+        if !enum.respond_to?(:to_a) && enum.respond_to?(:each_pair)
           enum.each_pair do |key, value|
             scope.repeat_item = value
             empty = false;
@@ -58,7 +58,7 @@ module Dryml::Helper
 
 
     def last_item?
-      if scope.repeat_collection.respond_to? :each_pair
+      if !scope.repeat_collection.respond_to?(:to_a) && scope.repeat_collection.respond_to?(:each_pair)
         this == scope.repeat_collection.last.try.last
       else
         this == scope.repeat_collection.last

data/lib/dryml/part_context.rb

@@ -89,7 +89,7 @@
 
       # Generate the HMAC keyed message digest. Uses SHA1 by default.
       def generate_digest(data, session)
-        secret = self.class.secret || Rails.application.config.secret_token
+        secret = self.class.secret || Rails.application.config.secret_key_base || Rails.application.config.secret_token
         key = secret.respond_to?(:call) ? secret.call(session) : secret
         OpenSSL::HMAC.hexdigest(OpenSSL::Digest::Digest.new(self.class.digest), key, data)
       end

data/lib/dryml/railtie/page_tag_resolver.rb

@@ -10,6 +10,7 @@ module Dryml
       def find_templates(name, prefix, partial, details)
         tag_name = @controller.dryml_fallback_tag || name.dasherize + '-page'
         method_name = tag_name.to_s.gsub('-', '_')
+        details[:virtual_path] = "#{prefix}/#{name}"
         if Dryml.empty_page_renderer(@controller.view_context).respond_to?(method_name)
           [ActionView::Template.new('', Dryml.page_tag_identifier(@controller.controller_path, tag_name),
                                     Dryml::Railtie::TemplateHandler, details)]

data/lib/dryml/railtie.rb

@@ -2,10 +2,8 @@ module Dryml
   class Railtie < Rails::Railtie
 
     ActiveSupport.on_load(:before_initialize) do |app|
-      require 'dryml'
-      require 'dryml/template'
-      require 'dryml/dryml_generator'
       require 'dryml/railtie/page_tag_resolver'
+      require 'dryml/railtie/template_handler'
     end
 
     ActiveSupport.on_load(:action_controller) do

data/lib/dryml/template_environment.rb

@@ -43,6 +43,12 @@ module Dryml
           view.instance_variables.each do |iv|
             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
         end
       end
     end
@@ -166,12 +172,11 @@ module Dryml
           object = this
         end
       end
-
       id = if (!object.is_a?(ActiveRecord::Relation) && typed_id = object.try.typed_id)
-             typed_id
-           elsif object == @this
-             "this"
-           end
+          typed_id
+        else
+          "this"
+        end
       attribute ? "#{id}:#{attribute}" : id
   end
 

data/lib/dryml.rb

@@ -80,7 +80,7 @@ module Dryml
 
   def imports_for_view(view)
     imports = []
-    imports << Sprockets::Helpers::RailsHelper if defined?(Sprockets) && defined?(Rails)
+    imports << Sprockets::Rails::Helper if defined?(Sprockets) && defined?(Rails)
     imports << ActionView::Helpers if defined?(ActionView)
     imports + view.controller.class.modules_for_helpers(view.controller.class.all_helpers_from_path(view.controller.class.helpers_path))
   end
@@ -245,4 +245,25 @@ private
 
 end
 
-require 'dryml/railtie' if Object.const_defined?(:Rails)
+require 'dryml/dryml_builder'
+require 'dryml/dryml_doc'
+require 'dryml/dryml_generator'
+require 'dryml/helper'
+require 'dryml/parser'
+require 'dryml/part_context'
+require 'dryml/scoped_variables'
+require 'dryml/tag_parameters'
+require 'dryml/taglib'
+require 'dryml/template'
+require 'dryml/template_environment'
+require 'dryml/extensions/action_controller/dryml_methods'
+require 'dryml/parser/attribute'
+require 'dryml/parser/base_parser'
+require 'dryml/parser/document'
+require 'dryml/parser/element'
+require 'dryml/parser/elements'
+require 'dryml/parser/source'
+require 'dryml/parser/text'
+require 'dryml/parser/tree_parser'
+
+require 'dryml/railtie' if defined?(Rails)

metadata

@@ -1,52 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: dryml
 version: !ruby/object:Gem::Version
-  version: 2.0.1
-  prerelease: 
+  version: 2.1.0.pre1
 platform: ruby
 authors:
 - Tom Locke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-23 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.2
 - !ruby/object:Gem::Dependency
   name: hobo_support
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0.pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0.pre1
 - !ruby/object:Gem::Dependency
   name: rubydoctest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -163,28 +152,26 @@ files:
 - test/dryml.rdoctest
 homepage: http://hobocentral.net
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: hobo
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: The Don't Repeat Yourself Markup Language
 test_files: []
-has_rdoc: