massimo 0.8.1 → 0.8.2

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    massimo (0.8.0)
+    massimo (0.8.1)
       activesupport (~> 3.0.0)
       i18n (~> 0.4.0)
+      padrino-helpers (~> 0.9.0)
       rack (~> 1.2.0)
-      sinatra_more (~> 0.3.0)
       thor (~> 0.14.0)
       tilt (~> 1.2.0)
       tzinfo (~> 0.3.0)
@@ -19,6 +19,9 @@ GEM
     diff-lcs (1.1.2)
     growl (1.0.3)
     haml (3.0.25)
+    http_router (0.5.3)
+      rack (>= 1.0.0)
+      url_mount (~> 0.2.1)
     i18n (0.4.2)
     jsmin (1.0.1)
     less (1.2.21)
@@ -28,6 +31,15 @@ GEM
     oyster (0.9.4)
     packr (3.1.0)
       oyster
+    padrino-core (0.9.20)
+      activesupport (>= 3.0.0)
+      http_router (~> 0.5.0)
+      sinatra (>= 1.1.0)
+      thor (>= 0.14.3)
+      tzinfo
+    padrino-helpers (0.9.20)
+      i18n (>= 0.4.1)
+      padrino-core (= 0.9.20)
     polyglot (0.3.1)
     rack (1.2.1)
     rack-test (0.5.7)
@@ -44,12 +56,6 @@ GEM
     sinatra (1.1.2)
       rack (~> 1.1)
       tilt (~> 1.2)
-    sinatra_more (0.3.40)
-      activesupport (>= 2.2.2)
-      bundler (>= 0.9.2)
-      sinatra (>= 0.9.2)
-      thor (>= 0.11.8)
-      tilt (>= 0.2)
     sprockets (1.0.2)
     test-construct (1.2.0)
     thor (0.14.6)
@@ -58,6 +64,8 @@ GEM
       polyglot (>= 0.3.1)
     tzinfo (0.3.24)
     unindent (0.9)
+    url_mount (0.2.1)
+      rack
     yui-compressor (0.9.3)
 
 PLATFORMS
@@ -74,11 +82,11 @@ DEPENDENCIES
   less (~> 1.2.0)
   massimo!
   packr (~> 3.1.0)
+  padrino-helpers (~> 0.9.0)
   rack (~> 1.2.0)
   rack-test (~> 0.5.0)
   rr (~> 1.0.0)
   rspec (~> 2.4.0)
-  sinatra_more (~> 0.3.0)
   sprockets (~> 1.0.0)
   test-construct (~> 1.2.0)
   thor (~> 0.14.0)

data/lib/massimo/helpers.rb

@@ -1,19 +1,27 @@
 require 'rack/utils' # needed for sinatra_more...
-require 'sinatra_more/markup_plugin'
+require 'padrino-helpers'
 
 module Massimo
   module Helpers
-    include SinatraMore::OutputHelpers
-    include SinatraMore::TagHelpers
-    include SinatraMore::AssetTagHelpers
-    include SinatraMore::FormHelpers
-    include SinatraMore::FormatHelpers
+    include Padrino::Helpers::DomHelpers
+    include Padrino::Helpers::OutputHelpers
+    include Padrino::Helpers::TagHelpers
+    include Padrino::Helpers::AssetTagHelpers
+    include Padrino::Helpers::FormHelpers
+    include Padrino::Helpers::FormatHelpers
+    include Padrino::Helpers::NumberHelpers
+    include Padrino::Helpers::TranslationHelpers
     
     # Returns an instance of the Site
     def site
       Massimo.site
     end
     
+    # Returns the current Site configuration
+    def config
+      Massimo.config
+    end
+    
     # Renders a view with the given locals. Kind of like `render :partial` in Rails
     def render(view_name, locals = {})
       view = Massimo::View.find(view_name)

data/lib/massimo/version.rb

@@ -1,3 +1,3 @@
 module Massimo
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 end

data/massimo.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.add_dependency             'activesupport',    '~> 3.0.0'
   s.add_dependency             'i18n',             '~> 0.4.0'
   s.add_dependency             'rack',             '~> 1.2.0'
-  s.add_dependency             'sinatra_more',     '~> 0.3.0'
+  s.add_dependency             'padrino-helpers',  '~> 0.9.0'
   s.add_dependency             'thor',             '~> 0.14.0'
   s.add_dependency             'tilt',             '~> 1.2.0'
   s.add_dependency             'tzinfo',           '~> 0.3.0'

data/spec/massimo/helpers_spec.rb

@@ -1,16 +1,19 @@
 require 'spec_helper'
 
 describe Massimo::Helpers do
-  it { should include(SinatraMore::OutputHelpers) }
-  it { should include(SinatraMore::TagHelpers) }
-  it { should include(SinatraMore::AssetTagHelpers) }
-  it { should include(SinatraMore::FormHelpers) }
-  it { should include(SinatraMore::FormatHelpers) }
+  it { should include(Padrino::Helpers::DomHelpers) }
+  it { should include(Padrino::Helpers::OutputHelpers) }
+  it { should include(Padrino::Helpers::TagHelpers) }
+  it { should include(Padrino::Helpers::AssetTagHelpers) }
+  it { should include(Padrino::Helpers::FormHelpers) }
+  it { should include(Padrino::Helpers::FormatHelpers) }
+  it { should include(Padrino::Helpers::NumberHelpers) }
+  it { should include(Padrino::Helpers::TranslationHelpers) }
   
   let(:helpers) { Object.new.extend(Massimo::Helpers) }
   
   describe '#render' do
-    it 'should render a view with the given locals' do
+    it 'renders a view with the given locals' do
       with_file 'views/partial.haml', '= local' do
         helpers.render('partial', :local => 'Local').should == "Local\n"
       end
@@ -18,9 +21,16 @@ describe Massimo::Helpers do
   end
   
   describe '#site' do
-    it 'should return the current site instance' do
+    it 'returns the current site instance' do
       site = Massimo::Site.new
       helpers.site.should === site
     end
   end
+  
+  describe '#config' do
+    it 'returns the current site configuration' do
+      site = Massimo::Site.new
+      helpers.config.should === site.config
+    end
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 1
-  version: 0.8.1
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - Pete Browne
@@ -63,7 +63,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: sinatra_more
+  name: padrino-helpers
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -72,9 +72,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 3
+        - 9
         - 0
-        version: 0.3.0
+        version: 0.9.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency