sinatra_more 0.0.4 → 0.0.5

data/README.rdoc

@@ -37,11 +37,9 @@ different components based on which pieces are useful for your application.
   require 'sinatra_more'
 
   class Application < Sinatra::Base
-    register SinatraMore
+    register SinatraMore::MarkupPlugin
+    register SinatraMore::RenderPlugin
     register SinatraMore::WardenPlugin
-    # (Not yet) register SinatraMore::MarkupHelpers
-    # (Not yet) register SinatraMore::RenderHelpers
-    # (Not yet) register SinatraMore::FormHelpers
   end
 
 This will then allow you to use whichever components that have been registered. A breakdown is below:

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/sinatra_more.rb

@@ -1,15 +1,5 @@
 require 'sinatra/base'
 
-require File.join(File.dirname(__FILE__) + '/sinatra_more/warden_helpers')
-require File.join(File.dirname(__FILE__) + '/sinatra_more/view_helpers')
-Dir.glob(File.dirname(__FILE__) + '/sinatra_more/form_builder/*.rb').each  { |f| require f }
-
-module SinatraMore
-  def self.registered(app)
-    app.helpers TagHelpers
-    app.helpers AssetTagHelpers
-    app.helpers FormHelpers
-    app.helpers FormatHelpers
-    app.helpers RenderHelpers
-  end
-end
+require File.join(File.dirname(__FILE__) + '/sinatra_more/markup_plugin')
+require File.join(File.dirname(__FILE__) + '/sinatra_more/render_plugin')
+require File.join(File.dirname(__FILE__) + '/sinatra_more/warden_plugin')

data/lib/sinatra_more/markup_plugin.rb

@@ -0,0 +1,12 @@
+Dir.glob(File.dirname(__FILE__) + '/markup_plugin/**/*.rb').each  { |f| require f }
+
+module SinatraMore
+  module MarkupPlugin
+    def self.registered(app)
+      app.helpers TagHelpers
+      app.helpers AssetTagHelpers
+      app.helpers FormHelpers
+      app.helpers FormatHelpers
+    end
+  end  
+end

data/lib/sinatra_more/render_plugin.rb

@@ -0,0 +1,9 @@
+Dir.glob(File.dirname(__FILE__) + '/render_plugin/**/*.rb').each  { |f| require f }
+
+module SinatraMore
+  module RenderPlugin
+    def self.registered(app)
+      app.helpers RenderHelpers
+    end
+  end  
+end

data/lib/sinatra_more/warden_plugin.rb

@@ -0,0 +1,24 @@
+Dir.glob(File.dirname(__FILE__) + '/warden_plugin/**/*.rb').each  { |f| require f }
+
+module SinatraMore
+  module WardenPlugin
+    def self.registered(app)
+      app.helpers SinatraMore::WardenHelpers
+
+      # TODO Improve serializing methods
+      Warden::Manager.serialize_into_session{ |user| user.nil? ? nil : user.id }
+      Warden::Manager.serialize_from_session{ |id|   id.nil? ? nil : User.find(id) }
+
+      Warden::Strategies.add(:password) do
+        def valid?
+          params['username'] || params['password']
+        end
+
+        def authenticate!
+          u = User.authenticate(params['username'], params['password'])
+          u.nil? ? fail!("Could not log in") : success!(u)
+        end
+      end
+    end
+  end
+end

data/lib/sinatra_more/{warden_helpers.rb → warden_plugin/warden_helpers.rb}

@@ -42,25 +42,4 @@ module SinatraMore
       request.env['warden']
     end
   end
-
-  module WardenPlugin
-    def self.registered(app)
-      app.helpers SinatraMore::WardenHelpers
-
-      # TODO Improve serializing
-      Warden::Manager.serialize_into_session{ |user| user.nil? ? nil : user.id }
-      Warden::Manager.serialize_from_session{ |id|   id.nil? ? nil : User.find(id) }
-
-      Warden::Strategies.add(:password) do
-        def valid?
-          params['username'] || params['password']
-        end
-
-        def authenticate!
-          u = User.authenticate(params['username'], params['password'])
-          u.nil? ? fail!("Could not log in") : success!(u)
-        end
-      end
-    end
-  end
-end
+end

data/sinatra_more.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_more}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Esquenazi"]
@@ -25,15 +25,17 @@ Gem::Specification.new do |s|
      "TODO",
      "VERSION",
      "lib/sinatra_more.rb",
-     "lib/sinatra_more/form_builder/abstract_form_builder.rb",
-     "lib/sinatra_more/form_builder/standard_form_builder.rb",
-     "lib/sinatra_more/view_helpers.rb",
-     "lib/sinatra_more/view_helpers/asset_tag_helpers.rb",
-     "lib/sinatra_more/view_helpers/form_helpers.rb",
-     "lib/sinatra_more/view_helpers/format_helpers.rb",
-     "lib/sinatra_more/view_helpers/render_helpers.rb",
-     "lib/sinatra_more/view_helpers/tag_helpers.rb",
-     "lib/sinatra_more/warden_helpers.rb",
+     "lib/sinatra_more/markup_plugin.rb",
+     "lib/sinatra_more/markup_plugin/asset_tag_helpers.rb",
+     "lib/sinatra_more/markup_plugin/form_builder/abstract_form_builder.rb",
+     "lib/sinatra_more/markup_plugin/form_builder/standard_form_builder.rb",
+     "lib/sinatra_more/markup_plugin/form_helpers.rb",
+     "lib/sinatra_more/markup_plugin/format_helpers.rb",
+     "lib/sinatra_more/markup_plugin/render_helpers.rb",
+     "lib/sinatra_more/markup_plugin/tag_helpers.rb",
+     "lib/sinatra_more/render_plugin.rb",
+     "lib/sinatra_more/warden_plugin.rb",
+     "lib/sinatra_more/warden_plugin/warden_helpers.rb",
      "sinatra_more.gemspec",
      "test/helper.rb",
      "test/test_sinatra_more.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_more
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Nathan Esquenazi
@@ -40,15 +40,17 @@ files:
 - TODO
 - VERSION
 - lib/sinatra_more.rb
-- lib/sinatra_more/form_builder/abstract_form_builder.rb
-- lib/sinatra_more/form_builder/standard_form_builder.rb
-- lib/sinatra_more/view_helpers.rb
-- lib/sinatra_more/view_helpers/asset_tag_helpers.rb
-- lib/sinatra_more/view_helpers/form_helpers.rb
-- lib/sinatra_more/view_helpers/format_helpers.rb
-- lib/sinatra_more/view_helpers/render_helpers.rb
-- lib/sinatra_more/view_helpers/tag_helpers.rb
-- lib/sinatra_more/warden_helpers.rb
+- lib/sinatra_more/markup_plugin.rb
+- lib/sinatra_more/markup_plugin/asset_tag_helpers.rb
+- lib/sinatra_more/markup_plugin/form_builder/abstract_form_builder.rb
+- lib/sinatra_more/markup_plugin/form_builder/standard_form_builder.rb
+- lib/sinatra_more/markup_plugin/form_helpers.rb
+- lib/sinatra_more/markup_plugin/format_helpers.rb
+- lib/sinatra_more/markup_plugin/render_helpers.rb
+- lib/sinatra_more/markup_plugin/tag_helpers.rb
+- lib/sinatra_more/render_plugin.rb
+- lib/sinatra_more/warden_plugin.rb
+- lib/sinatra_more/warden_plugin/warden_helpers.rb
 - sinatra_more.gemspec
 - test/helper.rb
 - test/test_sinatra_more.rb

data/lib/sinatra_more/view_helpers.rb

@@ -1 +0,0 @@
-Dir.glob(File.dirname(__FILE__) + '/view_helpers/*.rb').each  { |f| require f }