spiderfw 0.5.18 → 0.5.19

data/CHANGELOG

@@ -1,3 +1,8 @@
+= 0.5.19
+== 23 December, 2010
+* Made Ripl an optional dependency, since Bond can't be build on JRuby
+* Fixed bug in assets with compressed="true"
+
 = 0.5.18
 == 23 December, 2010
 * Ripl for spider console

data/VERSION

@@ -1 +1 @@
-0.5.18
+0.5.19

data/lib/spiderfw/templates/template.rb

@@ -412,10 +412,15 @@ module Spider
                 processor = TemplateAssets.const_get(ass_info[:processor])
                 ass = processor.process(ass)
             end
-            if attributes[:compressed]
-                compressed_res = Spider.find_resource(type.to_sym, attributes[:compressed], @path, [owner_class, @definer_class])
-                ass[:compressed_path] = compressed_res.path
-                ass[:compressed] = base_url+attributes[:compressed]
+            if cpr = attributes[:compressed] 
+                if cpr == "true"
+                    ass[:compressed_path] = ass[:path]
+                    ass[:compressed] = base_url + File.basename(ass[:path])
+                else
+                    compressed_res = Spider.find_resource(type.to_sym, cpr, @path, [owner_class, @definer_class])
+                    ass[:compressed_path] = compressed_res.path
+                    ass[:compressed] = base_url+cpr
+                end
             end
             [:gettext, :media, :if_ie_lte, :cdn].each do |key|
                 ass[key] = attributes[key] if attributes.key?(key)

data/spider.gemspec

@@ -39,12 +39,9 @@ Gem::Specification.new do |s|
   s.add_dependency("locale", ["> 2.0"])
   s.add_dependency("builder", ["> 2.1"])
   s.add_dependency("macaddr", [">= 1.0.0"])
-  s.add_dependency("ripl", [">= 0.2.8"])
-  s.add_dependency("ripl-irb", [">= 0.2.1"])
-  s.add_dependency("ripl-multi_line", [">= 0.2.1"])
   s.add_development_dependency("rake", ["> 0.7.3"])
   s.add_development_dependency("ruby-debug", ["> 0.9.3"])
-  s.requirements << "Optional dependencies: json, openssl, sqlite3, webrick, mongrel, ruby-oci8 >2.0, mysql, yui-compressor, home_run, cldr"
+  s.requirements << "Optional dependencies: ripl, ripl-irb, ripl-multi_line, json, openssl, sqlite3, webrick, mongrel, ruby-oci8 >2.0, mysql, yui-compressor, home_run, cldr"
   # optional dependencies
   # 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spiderfw
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: false
   segments: 
   - 0
   - 5
-  - 18
-  version: 0.5.18
+  - 19
+  version: 0.5.19
 platform: ruby
 authors: 
 - Ivan Pirlik
@@ -171,58 +171,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: ripl
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 2
-        - 8
-        version: 0.2.8
-  type: :runtime
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: ripl-irb
-  prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 2
-        - 1
-        version: 0.2.1
-  type: :runtime
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: ripl-multi_line
-  prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 2
-        - 1
-        version: 0.2.1
-  type: :runtime
-  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -234,11 +186,11 @@ dependencies:
         - 3
         version: 0.7.3
   type: :development
-  version_requirements: *id014
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: ruby-debug
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -250,7 +202,7 @@ dependencies:
         - 3
         version: 0.9.3
   type: :development
-  version_requirements: *id015
+  version_requirements: *id012
 description: Spider is yet another Ruby framework.
 email: abmajor7@gmail.com
 executables: 
@@ -1176,7 +1128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 requirements: 
-- "Optional dependencies: json, openssl, sqlite3, webrick, mongrel, ruby-oci8 >2.0, mysql, yui-compressor, home_run, cldr"
+- "Optional dependencies: ripl, ripl-irb, ripl-multi_line, json, openssl, sqlite3, webrick, mongrel, ruby-oci8 >2.0, mysql, yui-compressor, home_run, cldr"
 rubyforge_project: 
 rubygems_version: 1.3.7
 signing_key: