padrino-decorator 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0286629ca20948016d034dcd9c1459fd31e6e2b3
-  data.tar.gz: 3bd87ededa7140eb86e2d511d3993bce07209348
+  metadata.gz: e1b703f7ffaa93aac68495e727c6bf1d42dcb2b4
+  data.tar.gz: 73837985534feffac2f2279271923094d4365568
 SHA512:
-  metadata.gz: 0dbecda4a7eeab3da2ade044c51fff00a8c5bbf2a53f9613464c909a9a87199243fb8e4ffb21e12ed9075bfe4c8a282751fa45dbe0ac22a669ac62c060ec5083
-  data.tar.gz: d7a1b34ee790b2835fbe07d881a5f05ccd969bc3f9f7dc249b8ece9da39747d449d29e59628b4cf1d5444b9ff8794b36ffdf0cfe8bd5aa8996a9f64e38ebd9c1
+  metadata.gz: 433c0fefa75c02a64be79bdd30aed13d606ddfa16426d8e883899b585fcace77593ce7d73f80d346385765d4a1575710b29bdcc50ed789f552416e0c7b619ec4
+  data.tar.gz: 13bdfd7a84bbea49ae5f2ad9af380bea0c3997bf5ffc398378184cdbda825349025832e58420a5be9b7b966274a83c46dda46c3d60cdfbb19d5e5e7227dd2347

data/.travis.yml

@@ -6,7 +6,12 @@ install:
 rvm:
   - 1.9.3
   - 2.0.0
-  - jruby-19mode-1.7.4
+  - 2.1.0
+  - rbx
+  - jruby-19mode
 branches:
   only:
     - master
+matrix:
+  allow_failures:
+    - rvm: rbx

data/Gemfile

@@ -3,6 +3,10 @@ source 'https://rubygems.org'
 gemspec
 gem 'rake'
 
+group :development, :test do
+  gem 'coveralls', :require => false
+end
+
 group :test do
   gem 'rack-test',  '>= 0.5.0'
   gem 'minitest',   '~> 4.0'
@@ -12,6 +16,6 @@ end
 
 group :development do
   gem 'yard',       '>= 0.7.2'
-  gem 'redcarpet'
+  gem 'kramdown'
   gem 'github-markup'
 end

data/README.md

@@ -3,6 +3,11 @@
 padrino-decorator is a gem for [Padrino](http://www.padrinorb.com/).  
 Adds an object-oriented layer of presentation logic to your Padrino application.
 
+[![Build Status](https://travis-ci.org/tyabe/padrino-decorator.png?branch=master)](https://travis-ci.org/tyabe/padrino-decorator)
+[![Code Climate](https://codeclimate.com/github/tyabe/padrino-decorator.png)](https://codeclimate.com/github/tyabe/padrino-decorator)
+[![Coverage Status](https://coveralls.io/repos/tyabe/padrino-decorator/badge.png)](https://coveralls.io/r/tyabe/padrino-decorator)
+[![Dependency Status](https://gemnasium.com/tyabe/padrino-decorator.png)](https://gemnasium.com/tyabe/padrino-decorator)
+
 ## Installation
 
 Add the following to your `Gemfile`:
@@ -17,7 +22,7 @@ And then execute:
 $ bundle
 ```
 
-## Controller Generator
+## Decorator Generator
 
 Padrino provides generator support for quickly creating new decorators within your Padrino application.
 Note that the decorator tests are generated specifically tailored towards the testing framework chosen during application generation.
@@ -68,6 +73,44 @@ $ padrino-gen decorator User
   </tbody>
 </table>
 
+## Examples
+
+```ruby
+# app/controllers/posts.rb
+SampleProject::App.controllers :posts do
+
+  get :index do
+    source = Post.all
+    @posts = decorate(source)
+    render 'posts/index'
+  end
+
+  get :show, with: :id do
+    source = Post.find(params[:id])
+    @post = decorate(source)
+    # or
+    @post = PostDecorator.new(source, context: self)
+    render 'posts/show'
+  end
+
+end
+
+# app/decorators/post_decorator.rb
+class PostDecorator < Padrino::Decorator::Base
+  context SampleProject::App
+
+  def formated_body
+    h.simple_format(object.body)
+  end
+
+end
+
+# app/views/posts/show.slim
+h1 = @post.title
+div
+  = @post.formated_body
+```
+
 ## Contributing
 
 1. Fork it

data/lib/generators/decorator.rb

@@ -41,7 +41,10 @@ module Padrino
           check_app_existence(app)
           inject_into_file(destination_root(app, "app.rb"), "    register Padrino::Decorator::Helpers\n", :after => "Padrino::Application\n")
           self.behavior = :revoke if options[:destroy]
-          @object_name    = name.to_s.underscore
+          @object_name  = name.to_s.underscore
+          @project_name = options[:namespace].underscore.camelize
+          @project_name = fetch_project_name(app) if @project_name.empty?
+          @app_name     = fetch_app_name(app)
           template 'templates/decorator.rb.tt', destination_root(app, 'decorators', "#{@object_name}_decorator.rb")
           if test?
             choice = fetch_component_choice(:test)

data/lib/generators/templates/decorator.rb.tt

@@ -1,11 +1,11 @@
 class <%= @object_name.camelize %>Decorator < Padrino::Decorator::Base
-  decorate :<%= @object_name %>
+  context <%= @project_name %>::<%= @app_name %>
 
   # def decorated_method
   #  # We can use a specified object through the accessor method.
   #  # Also can use a helper method in specified context through the 'h' method.
-  #  if <%= @object_name %>.present?
-  #    h.content_tag :span, <%= @object_name %>.to_s
+  #  if object.present?
+  #    h.content_tag :span, object.to_s
   #  else
   #    h.content_tag :span, 'None'
   #  end

data/lib/padrino-decorator/base.rb

@@ -3,20 +3,12 @@ module Padrino
   module Decorator
     class Base < SimpleDelegator
 
-      class << self
+      attr_reader :object
 
-        def decorate(name)
-          define_method(name) do
-            @model
-          end
-        end
-
-      end # ClassMethods
-
-      def initialize(model, context)
-        @model = model
-        @context = context
-        super(model)
+      def initialize(object, options = {})
+        @object = object
+        @context = options[:context]
+        super(object)
       end
 
       def to_model
@@ -42,8 +34,12 @@ module Padrino
 
       private
 
-      def h
-        @context
+      def self.context(context)
+        _helper_method_name = :h
+        define_method(_helper_method_name) do
+          @context || context.to_s.camelize.constantize.new!
+        end
+        private _helper_method_name
       end
 
     end # Base

data/lib/padrino-decorator/decorate_helpers.rb

@@ -3,14 +3,19 @@ module Padrino
 
     module DecorateHelpers
       def decorate(object, options = {})
+
+        klass = options[:as]
+
         if object.respond_to?(:first)
           return [] if object.empty?
-          klass_name = "#{object.first.class.to_s.pluralize}Decorator"
+          klass_name = "#{object.first.class}Decorator"
+          klass = klass_name.constantize if klass.nil?
+          decorator = object.map{|o| klass.new(o, context: self)}
         else
           klass_name = "#{object.class}Decorator"
+          klass = klass_name.constantize if klass.nil?
+          decorator = klass.new(object, context: self)
         end
-        klass = options.fetch(:as) { klass_name.constantize }
-        decorator = klass.new(object, self)
 
         yield decorator if block_given?
         decorator

data/lib/padrino-decorator/helpers.rb

@@ -16,8 +16,10 @@ module Padrino
       class << self
         def registered(app)
           app.helpers Padrino::Decorator::DecorateHelpers
-          app.load_paths    << File.join(app.settings.root, 'decorators')
-          Padrino.dependency_paths << File.join(app.settings.root, 'decorators/**/*.rb')
+          app.load_paths << File.join(app.settings.root, 'decorators')
+          decorators_path = File.join(app.settings.root, 'decorators/**/*.rb')
+          Padrino.dependency_paths << decorators_path
+          Padrino.require_dependencies(decorators_path)
         end
         alias :included :registered
       end

data/lib/padrino-decorator/version.rb

@@ -1,6 +1,6 @@
 module Padrino
   module Decorator
-    VERSION = '0.0.1' unless defined?(Padrino::Decorator::VERSION)
+    VERSION = '0.0.2' unless defined?(Padrino::Decorator::VERSION)
 
     def self.version
       VERSION

data/padrino-decorator.gemspec

@@ -22,8 +22,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rdoc_options  = ["--charset=UTF-8"]
 
-  s.add_dependency "padrino-gen", "~> 0.11.0"
-  s.add_dependency "padrino-helpers", "~> 0.11.0"
-
-  s.add_development_dependency "padrino-core", "~> 0.11.0"
+  s.add_dependency("padrino-core", "> 0.11")
+  s.add_dependency "padrino-gen",  "> 0.11.0"
+  s.add_dependency "padrino-helpers", "> 0.11.0"
 end

data/test/helpers/helper.rb

@@ -11,3 +11,8 @@ require 'turn'
 class MiniTest::Spec
   include Rack::Test::Methods
 end
+
+if ENV['TRAVIS']
+  require 'coveralls'
+  Coveralls.wear!
+end

data/test/test_base.rb

@@ -3,16 +3,15 @@ require File.expand_path("#{File.dirname(__FILE__)}/helpers/helper")
 describe Padrino::Decorator::Base do
   let(:decorator_class) { Class.new(Padrino::Decorator::Base) }
   let(:model)           { Object.new }
-  let(:context)         { Object.new }
 
   describe "#initialize" do
-    subject { decorator_class.new(model, context) }
+    subject { decorator_class.new(model) }
 
     it 'Reports its type as if it was the original object' do
       subject.class.must_equal model.class
-      subject.must_be_kind_of  model.class # Can't be verified correctly in 'must_be_kind_of'
-      assert subject.kind_of?(model.class), "The subject class (#{subject.class}) is not kind_of? the model class (#{model.class})."
-      assert subject.is_a?(model.class), "The subject class (#{subject.class}) is not is_a? the model class (#{model.class})."
+      subject.must_be_kind_of  model.class
+      assert subject.kind_of?(model.class),     "The subject class (#{subject.class}) is not kind_of? the model class (#{model.class})."
+      assert subject.is_a?(model.class),        "The subject class (#{subject.class}) is not is_a? the model class (#{model.class})."
       assert subject.instance_of?(model.class), "The subject class (#{subject.class}) is not an instance_of? the model class (#{model.class})."
     end
   end

data/test/test_decorate_helpers.rb

@@ -1,6 +1,7 @@
 require File.expand_path("#{File.dirname(__FILE__)}/helpers/helper")
 
 describe Padrino::Decorator::DecorateHelpers do
+
   class User
     attr_accessor :username, :full_name
     def initialize(attributes = {})
@@ -9,31 +10,27 @@ describe Padrino::Decorator::DecorateHelpers do
       end
     end
   end
+
   class UserDecorator < Padrino::Decorator::Base
-    decorate :user
     def name
-      user.full_name.present? ? user.full_name : user.username
-    end
-  end
-  class UsersDecorator < Padrino::Decorator::Base
-    decorate :users
-    def name_list
-      users.map{|u| h.decorate(u).name}
+      object.full_name.present? ? object.full_name : object.username
     end
   end
 
   include Padrino::Decorator::DecorateHelpers
 
   describe '.decorate' do
+    let(:dorothy) { User.new(username: 'Dorothy', full_name: 'Dorothy Gale') }
+    let(:toto)    { User.new(username: 'Toto') }
+
     it 'Possible to decorate the single object' do
-      user = User.new(username: 'Dorothy', full_name: 'Dorothy Gale')
-      assert_equal decorate(user).name, user.full_name
+      assert_equal decorate(dorothy).name, dorothy.full_name
     end
     it 'Possible to decorate the collections' do
       users = []
-      users << User.new(username: 'Dorothy')
-      users << User.new(username: 'Toto')
-      assert_equal decorate(users).name_list, %w[Dorothy Toto]
+      users << dorothy
+      users << toto
+      assert_equal decorate(users).first.name, dorothy.full_name
     end
   end
 

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: padrino-decorator
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Takeshi Yabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-25 00:00:00.000000000 Z
+date: 2014-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: padrino-gen
+  name: padrino-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0.11'
 - !ruby/object:Gem::Dependency
-  name: padrino-helpers
+  name: padrino-gen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">"
       - !ruby/object:Gem::Version
         version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">"
       - !ruby/object:Gem::Version
         version: 0.11.0
 - !ruby/object:Gem::Dependency
-  name: padrino-core
+  name: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">"
       - !ruby/object:Gem::Version
         version: 0.11.0
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">"
       - !ruby/object:Gem::Version
         version: 0.11.0
 description: Object-Oriented layer of presentation logic to your Padrino apps.
@@ -59,10 +59,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
-- .travis.yml
-- .yardopts
+- ".document"
+- ".gitignore"
+- ".travis.yml"
+- ".yardopts"
 - Gemfile
 - LICENSE
 - README.md
@@ -91,22 +91,22 @@ licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: padrino-decorator
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: View models for padrino