merb-more 1.0.12 → 1.0.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/LICENSE +20 -0
 - data/Rakefile +10 -5
 - metadata +16 -16
 
    
        data/LICENSE
    CHANGED
    
    | 
         @@ -0,0 +1,20 @@ 
     | 
|
| 
      
 1 
     | 
    
         
            +
            Copyright (c) 2008 Engine Yard
         
     | 
| 
      
 2 
     | 
    
         
            +
             
     | 
| 
      
 3 
     | 
    
         
            +
            Permission is hereby granted, free of charge, to any person obtaining
         
     | 
| 
      
 4 
     | 
    
         
            +
            a copy of this software and associated documentation files (the
         
     | 
| 
      
 5 
     | 
    
         
            +
            "Software"), to deal in the Software without restriction, including
         
     | 
| 
      
 6 
     | 
    
         
            +
            without limitation the rights to use, copy, modify, merge, publish,
         
     | 
| 
      
 7 
     | 
    
         
            +
            distribute, sublicense, and/or sell copies of the Software, and to
         
     | 
| 
      
 8 
     | 
    
         
            +
            permit persons to whom the Software is furnished to do so, subject to
         
     | 
| 
      
 9 
     | 
    
         
            +
            the following conditions:
         
     | 
| 
      
 10 
     | 
    
         
            +
             
     | 
| 
      
 11 
     | 
    
         
            +
            The above copyright notice and this permission notice shall be
         
     | 
| 
      
 12 
     | 
    
         
            +
            included in all copies or substantial portions of the Software.
         
     | 
| 
      
 13 
     | 
    
         
            +
             
     | 
| 
      
 14 
     | 
    
         
            +
            THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
         
     | 
| 
      
 15 
     | 
    
         
            +
            EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
         
     | 
| 
      
 16 
     | 
    
         
            +
            MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
         
     | 
| 
      
 17 
     | 
    
         
            +
            NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
         
     | 
| 
      
 18 
     | 
    
         
            +
            LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
         
     | 
| 
      
 19 
     | 
    
         
            +
            OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
         
     | 
| 
      
 20 
     | 
    
         
            +
            WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
         
     | 
    
        data/Rakefile
    CHANGED
    
    | 
         @@ -43,12 +43,11 @@ merb_release = { 
     | 
|
| 
       43 
43 
     | 
    
         
             
                  "merb-mailer",
         
     | 
| 
       44 
44 
     | 
    
         
             
                  "merb-param-protection",
         
     | 
| 
       45 
45 
     | 
    
         
             
                  "merb_datamapper",
         
     | 
| 
       46 
     | 
    
         
            -
                  "merb" 
     | 
| 
       47 
     | 
    
         
            -
                  "merb-more"
         
     | 
| 
      
 46 
     | 
    
         
            +
                  "merb"
         
     | 
| 
       48 
47 
     | 
    
         
             
                ]
         
     | 
| 
       49 
48 
     | 
    
         
             
            }
         
     | 
| 
       50 
49 
     | 
    
         | 
| 
       51 
     | 
    
         
            -
            merb_gem_paths = %w[merb 
     | 
| 
      
 50 
     | 
    
         
            +
            merb_gem_paths = %w[merb-core merb_datamapper] + merb_more_gem_paths + %w[merb]
         
     | 
| 
       52 
51 
     | 
    
         | 
| 
       53 
52 
     | 
    
         
             
            merb_gems = merb_gem_paths.map { |p| File.basename(p) }
         
     | 
| 
       54 
53 
     | 
    
         
             
            merb_more_gems = merb_more_gem_paths.map { |p| File.basename(p) }
         
     | 
| 
         @@ -115,11 +114,17 @@ task :install do 
     | 
|
| 
       115 
114 
     | 
    
         
             
              merb_gems.each do |gem|
         
     | 
| 
       116 
115 
     | 
    
         
             
                Merb::RakeHelper.install(gem, :version => Merb::VERSION)
         
     | 
| 
       117 
116 
     | 
    
         
             
              end
         
     | 
| 
       118 
     | 
    
         
            -
              puts %x{sudo gem install pkg/merb-more-#{Merb::VERSION}.gem}
         
     | 
| 
       119 
117 
     | 
    
         
             
            end
         
     | 
| 
       120 
118 
     | 
    
         | 
| 
       121 
119 
     | 
    
         
             
            desc "Uninstall all gems"
         
     | 
| 
       122 
     | 
    
         
            -
            task :uninstall  
     | 
| 
      
 120 
     | 
    
         
            +
            task :uninstall do
         
     | 
| 
      
 121 
     | 
    
         
            +
              merb_gems.each do |gem|
         
     | 
| 
      
 122 
     | 
    
         
            +
                Merb::RakeHelper.uninstall(gem, :version => Merb::VERSION)
         
     | 
| 
      
 123 
     | 
    
         
            +
              end
         
     | 
| 
      
 124 
     | 
    
         
            +
              Merb::RakeHelper.uninstall('merb-auth-slice-password', :version => Merb::VERSION)
         
     | 
| 
      
 125 
     | 
    
         
            +
              Merb::RakeHelper.uninstall('merb-auth-more', :version => Merb::VERSION)
         
     | 
| 
      
 126 
     | 
    
         
            +
              Merb::RakeHelper.uninstall('merb-auth-core', :version => Merb::VERSION)
         
     | 
| 
      
 127 
     | 
    
         
            +
            end
         
     | 
| 
       123 
128 
     | 
    
         | 
| 
       124 
129 
     | 
    
         
             
            desc "Build the merb-more gems"
         
     | 
| 
       125 
130 
     | 
    
         
             
            task :build_gems do
         
     | 
    
        metadata
    CHANGED
    
    | 
         @@ -1,7 +1,7 @@ 
     | 
|
| 
       1 
1 
     | 
    
         
             
            --- !ruby/object:Gem::Specification 
         
     | 
| 
       2 
2 
     | 
    
         
             
            name: merb-more
         
     | 
| 
       3 
3 
     | 
    
         
             
            version: !ruby/object:Gem::Version 
         
     | 
| 
       4 
     | 
    
         
            -
              version: 1.0. 
     | 
| 
      
 4 
     | 
    
         
            +
              version: 1.0.13
         
     | 
| 
       5 
5 
     | 
    
         
             
            platform: ruby
         
     | 
| 
       6 
6 
     | 
    
         
             
            authors: 
         
     | 
| 
       7 
7 
     | 
    
         
             
            - Engine Yard
         
     | 
| 
         @@ -9,7 +9,7 @@ autorequire: 
     | 
|
| 
       9 
9 
     | 
    
         
             
            bindir: bin
         
     | 
| 
       10 
10 
     | 
    
         
             
            cert_chain: []
         
     | 
| 
       11 
11 
     | 
    
         | 
| 
       12 
     | 
    
         
            -
            date: 2009- 
     | 
| 
      
 12 
     | 
    
         
            +
            date: 2009-11-03 00:00:00 +00:00
         
     | 
| 
       13 
13 
     | 
    
         
             
            default_executable: 
         
     | 
| 
       14 
14 
     | 
    
         
             
            dependencies: 
         
     | 
| 
       15 
15 
     | 
    
         
             
            - !ruby/object:Gem::Dependency 
         
     | 
| 
         @@ -20,7 +20,7 @@ dependencies: 
     | 
|
| 
       20 
20 
     | 
    
         
             
                requirements: 
         
     | 
| 
       21 
21 
     | 
    
         
             
                - - ">="
         
     | 
| 
       22 
22 
     | 
    
         
             
                  - !ruby/object:Gem::Version 
         
     | 
| 
       23 
     | 
    
         
            -
                    version: 1.0. 
     | 
| 
      
 23 
     | 
    
         
            +
                    version: 1.0.13
         
     | 
| 
       24 
24 
     | 
    
         
             
                version: 
         
     | 
| 
       25 
25 
     | 
    
         
             
            - !ruby/object:Gem::Dependency 
         
     | 
| 
       26 
26 
     | 
    
         
             
              name: merb-action-args
         
     | 
| 
         @@ -30,7 +30,7 @@ dependencies: 
     | 
|
| 
       30 
30 
     | 
    
         
             
                requirements: 
         
     | 
| 
       31 
31 
     | 
    
         
             
                - - "="
         
     | 
| 
       32 
32 
     | 
    
         
             
                  - !ruby/object:Gem::Version 
         
     | 
| 
       33 
     | 
    
         
            -
                    version: 1.0. 
     | 
| 
      
 33 
     | 
    
         
            +
                    version: 1.0.13
         
     | 
| 
       34 
34 
     | 
    
         
             
                version: 
         
     | 
| 
       35 
35 
     | 
    
         
             
            - !ruby/object:Gem::Dependency 
         
     | 
| 
       36 
36 
     | 
    
         
             
              name: merb-assets
         
     | 
| 
         @@ -40,7 +40,7 @@ dependencies: 
     | 
|
| 
       40 
40 
     | 
    
         
             
                requirements: 
         
     | 
| 
       41 
41 
     | 
    
         
             
                - - "="
         
     | 
| 
       42 
42 
     | 
    
         
             
                  - !ruby/object:Gem::Version 
         
     | 
| 
       43 
     | 
    
         
            -
                    version: 1.0. 
     | 
| 
      
 43 
     | 
    
         
            +
                    version: 1.0.13
         
     | 
| 
       44 
44 
     | 
    
         
             
                version: 
         
     | 
| 
       45 
45 
     | 
    
         
             
            - !ruby/object:Gem::Dependency 
         
     | 
| 
       46 
46 
     | 
    
         
             
              name: merb-slices
         
     | 
| 
         @@ -50,7 +50,7 @@ dependencies: 
     | 
|
| 
       50 
50 
     | 
    
         
             
                requirements: 
         
     | 
| 
       51 
51 
     | 
    
         
             
                - - "="
         
     | 
| 
       52 
52 
     | 
    
         
             
                  - !ruby/object:Gem::Version 
         
     | 
| 
       53 
     | 
    
         
            -
                    version: 1.0. 
     | 
| 
      
 53 
     | 
    
         
            +
                    version: 1.0.13
         
     | 
| 
       54 
54 
     | 
    
         
             
                version: 
         
     | 
| 
       55 
55 
     | 
    
         
             
            - !ruby/object:Gem::Dependency 
         
     | 
| 
       56 
56 
     | 
    
         
             
              name: merb-auth
         
     | 
| 
         @@ -60,7 +60,7 @@ dependencies: 
     | 
|
| 
       60 
60 
     | 
    
         
             
                requirements: 
         
     | 
| 
       61 
61 
     | 
    
         
             
                - - "="
         
     | 
| 
       62 
62 
     | 
    
         
             
                  - !ruby/object:Gem::Version 
         
     | 
| 
       63 
     | 
    
         
            -
                    version: 1.0. 
     | 
| 
      
 63 
     | 
    
         
            +
                    version: 1.0.13
         
     | 
| 
       64 
64 
     | 
    
         
             
                version: 
         
     | 
| 
       65 
65 
     | 
    
         
             
            - !ruby/object:Gem::Dependency 
         
     | 
| 
       66 
66 
     | 
    
         
             
              name: merb-cache
         
     | 
| 
         @@ -70,7 +70,7 @@ dependencies: 
     | 
|
| 
       70 
70 
     | 
    
         
             
                requirements: 
         
     | 
| 
       71 
71 
     | 
    
         
             
                - - "="
         
     | 
| 
       72 
72 
     | 
    
         
             
                  - !ruby/object:Gem::Version 
         
     | 
| 
       73 
     | 
    
         
            -
                    version: 1.0. 
     | 
| 
      
 73 
     | 
    
         
            +
                    version: 1.0.13
         
     | 
| 
       74 
74 
     | 
    
         
             
                version: 
         
     | 
| 
       75 
75 
     | 
    
         
             
            - !ruby/object:Gem::Dependency 
         
     | 
| 
       76 
76 
     | 
    
         
             
              name: merb-exceptions
         
     | 
| 
         @@ -80,7 +80,7 @@ dependencies: 
     | 
|
| 
       80 
80 
     | 
    
         
             
                requirements: 
         
     | 
| 
       81 
81 
     | 
    
         
             
                - - "="
         
     | 
| 
       82 
82 
     | 
    
         
             
                  - !ruby/object:Gem::Version 
         
     | 
| 
       83 
     | 
    
         
            -
                    version: 1.0. 
     | 
| 
      
 83 
     | 
    
         
            +
                    version: 1.0.13
         
     | 
| 
       84 
84 
     | 
    
         
             
                version: 
         
     | 
| 
       85 
85 
     | 
    
         
             
            - !ruby/object:Gem::Dependency 
         
     | 
| 
       86 
86 
     | 
    
         
             
              name: merb-gen
         
     | 
| 
         @@ -90,7 +90,7 @@ dependencies: 
     | 
|
| 
       90 
90 
     | 
    
         
             
                requirements: 
         
     | 
| 
       91 
91 
     | 
    
         
             
                - - "="
         
     | 
| 
       92 
92 
     | 
    
         
             
                  - !ruby/object:Gem::Version 
         
     | 
| 
       93 
     | 
    
         
            -
                    version: 1.0. 
     | 
| 
      
 93 
     | 
    
         
            +
                    version: 1.0.13
         
     | 
| 
       94 
94 
     | 
    
         
             
                version: 
         
     | 
| 
       95 
95 
     | 
    
         
             
            - !ruby/object:Gem::Dependency 
         
     | 
| 
       96 
96 
     | 
    
         
             
              name: merb-haml
         
     | 
| 
         @@ -100,7 +100,7 @@ dependencies: 
     | 
|
| 
       100 
100 
     | 
    
         
             
                requirements: 
         
     | 
| 
       101 
101 
     | 
    
         
             
                - - "="
         
     | 
| 
       102 
102 
     | 
    
         
             
                  - !ruby/object:Gem::Version 
         
     | 
| 
       103 
     | 
    
         
            -
                    version: 1.0. 
     | 
| 
      
 103 
     | 
    
         
            +
                    version: 1.0.13
         
     | 
| 
       104 
104 
     | 
    
         
             
                version: 
         
     | 
| 
       105 
105 
     | 
    
         
             
            - !ruby/object:Gem::Dependency 
         
     | 
| 
       106 
106 
     | 
    
         
             
              name: merb-helpers
         
     | 
| 
         @@ -110,7 +110,7 @@ dependencies: 
     | 
|
| 
       110 
110 
     | 
    
         
             
                requirements: 
         
     | 
| 
       111 
111 
     | 
    
         
             
                - - "="
         
     | 
| 
       112 
112 
     | 
    
         
             
                  - !ruby/object:Gem::Version 
         
     | 
| 
       113 
     | 
    
         
            -
                    version: 1.0. 
     | 
| 
      
 113 
     | 
    
         
            +
                    version: 1.0.13
         
     | 
| 
       114 
114 
     | 
    
         
             
                version: 
         
     | 
| 
       115 
115 
     | 
    
         
             
            - !ruby/object:Gem::Dependency 
         
     | 
| 
       116 
116 
     | 
    
         
             
              name: merb-mailer
         
     | 
| 
         @@ -120,7 +120,7 @@ dependencies: 
     | 
|
| 
       120 
120 
     | 
    
         
             
                requirements: 
         
     | 
| 
       121 
121 
     | 
    
         
             
                - - "="
         
     | 
| 
       122 
122 
     | 
    
         
             
                  - !ruby/object:Gem::Version 
         
     | 
| 
       123 
     | 
    
         
            -
                    version: 1.0. 
     | 
| 
      
 123 
     | 
    
         
            +
                    version: 1.0.13
         
     | 
| 
       124 
124 
     | 
    
         
             
                version: 
         
     | 
| 
       125 
125 
     | 
    
         
             
            - !ruby/object:Gem::Dependency 
         
     | 
| 
       126 
126 
     | 
    
         
             
              name: merb-param-protection
         
     | 
| 
         @@ -130,7 +130,7 @@ dependencies: 
     | 
|
| 
       130 
130 
     | 
    
         
             
                requirements: 
         
     | 
| 
       131 
131 
     | 
    
         
             
                - - "="
         
     | 
| 
       132 
132 
     | 
    
         
             
                  - !ruby/object:Gem::Version 
         
     | 
| 
       133 
     | 
    
         
            -
                    version: 1.0. 
     | 
| 
      
 133 
     | 
    
         
            +
                    version: 1.0.13
         
     | 
| 
       134 
134 
     | 
    
         
             
                version: 
         
     | 
| 
       135 
135 
     | 
    
         
             
            description: (merb - merb-core) == merb-more.  The Full Stack. Take what you need; leave what you don't.
         
     | 
| 
       136 
136 
     | 
    
         
             
            email: merb@engineyard.com
         
     | 
| 
         @@ -146,7 +146,7 @@ files: 
     | 
|
| 
       146 
146 
     | 
    
         
             
            - Rakefile
         
     | 
| 
       147 
147 
     | 
    
         
             
            - TODO
         
     | 
| 
       148 
148 
     | 
    
         
             
            - lib/merb-more.rb
         
     | 
| 
       149 
     | 
    
         
            -
            has_rdoc:  
     | 
| 
      
 149 
     | 
    
         
            +
            has_rdoc: true
         
     | 
| 
       150 
150 
     | 
    
         
             
            homepage: http://www.merbivore.com
         
     | 
| 
       151 
151 
     | 
    
         
             
            licenses: []
         
     | 
| 
       152 
152 
     | 
    
         | 
| 
         @@ -170,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement 
     | 
|
| 
       170 
170 
     | 
    
         
             
            requirements: []
         
     | 
| 
       171 
171 
     | 
    
         | 
| 
       172 
172 
     | 
    
         
             
            rubyforge_project: merb-more
         
     | 
| 
       173 
     | 
    
         
            -
            rubygems_version: 1.3. 
     | 
| 
      
 173 
     | 
    
         
            +
            rubygems_version: 1.3.5
         
     | 
| 
       174 
174 
     | 
    
         
             
            signing_key: 
         
     | 
| 
       175 
175 
     | 
    
         
             
            specification_version: 3
         
     | 
| 
       176 
176 
     | 
    
         
             
            summary: (merb - merb-core) == merb-more.  The Full Stack. Take what you need; leave what you don't.
         
     |