dindi 0.5.3 → 0.6.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (11) hide show
  1. data/Gemfile.lock +21 -10
  2. data/Rakefile +1 -1
  3. data/VERSION +1 -1
  4. data/lib/dindi/file_templates/1.9.1/Gemfile.erb +4 -3
  5. data/lib/dindi/file_templates/1.9.1/config.ru.erb +1 -1
  6. data/lib/dindi/file_templates/1.9.1/database.yml.erb +1 -1
  7. data/lib/dindi/file_templates/1.9.1/models.rb.erb +2 -0
  8. data/lib/dindi/file_templates/1.9.2/models.rb.erb +1 -0
  9. data/lib/dindi/file_templates/shared/docs.haml.erb +7 -5
  10. data/lib/dindi/file_templates/shared/helpers.rb.erb +2 -2
  11. metadata +46 -16
data/Gemfile.lock CHANGED
@@ -1,23 +1,34 @@
1
1
  GEM
2
2
  remote: http://rubygems.org/
3
3
  specs:
4
+ activesupport (3.2.13)
5
+ i18n (= 0.6.1)
6
+ multi_json (~> 1.0)
7
+ bourne (1.4.0)
8
+ mocha (~> 0.13.2)
4
9
  colorize (0.5.8)
5
10
  git (1.2.5)
11
+ i18n (0.6.1)
6
12
  jeweler (1.6.4)
7
13
  bundler (~> 1.0)
8
14
  git (>= 1.2.5)
9
15
  rake
10
- multi_json (1.3.6)
11
- rake (0.9.2.2)
12
- shoulda (3.0.1)
13
- shoulda-context (~> 1.0.0)
14
- shoulda-matchers (~> 1.0.0)
15
- shoulda-context (1.0.0)
16
- shoulda-matchers (1.0.0)
17
- simplecov (0.6.4)
16
+ metaclass (0.0.1)
17
+ mocha (0.13.3)
18
+ metaclass (~> 0.0.1)
19
+ multi_json (1.7.2)
20
+ rake (10.0.4)
21
+ shoulda (3.4.0)
22
+ shoulda-context (~> 1.0, >= 1.0.1)
23
+ shoulda-matchers (~> 1.0, >= 1.4.1)
24
+ shoulda-context (1.1.1)
25
+ shoulda-matchers (1.5.6)
26
+ activesupport (>= 3.0.0)
27
+ bourne (~> 1.3)
28
+ simplecov (0.7.1)
18
29
  multi_json (~> 1.0)
19
- simplecov-html (~> 0.5.3)
20
- simplecov-html (0.5.3)
30
+ simplecov-html (~> 0.7.1)
31
+ simplecov-html (0.7.1)
21
32
 
22
33
  PLATFORMS
23
34
  ruby
data/Rakefile CHANGED
@@ -44,7 +44,7 @@ end
44
44
 
45
45
  task :default => :test
46
46
 
47
- require 'rake/rdoctask'
47
+ require 'rdoc/task'
48
48
  Rake::RDocTask.new do |rdoc|
49
49
  version = File.exist?('VERSION') ? File.read('VERSION') : ""
50
50
 
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.5.3
1
+ 0.6.0
data/lib/dindi/file_templates/1.9.1/Gemfile.erb CHANGED
@@ -2,9 +2,10 @@ source "http://rubygems.org"
2
2
 
3
3
  gem "rack", "1.2.2"
4
4
  gem "sinatra", "1.2.6"
5
- gem "haml"
6
- gem "activesupport", "=2.3.14"
7
- gem "activerecord", "=2.3.14"
5
+ gem "haml", "3.0.13"
6
+ gem "activesupport", "~> 3.0.9"
7
+ gem "activerecord", "~> 3.0.9"
8
+ gem "mysql2", "~> 0.2.7"
8
9
  gem "json"
9
10
  gem "pony"
10
11
  gem "thin"
data/lib/dindi/file_templates/1.9.1/config.ru.erb CHANGED
@@ -35,7 +35,7 @@ class Sinatra::Base
35
35
  include DebugOn
36
36
 
37
37
  # set sinatra's variables
38
- set :root, File.dirname(__FILE__)
38
+ set :root, ::File.dirname(__FILE__)
39
39
  set :environment, :production
40
40
  enable :sessions, :logging, :dump_errors, :show_exceptions
41
41
  disable :run, :reload
data/lib/dindi/file_templates/1.9.1/database.yml.erb CHANGED
@@ -1,5 +1,5 @@
1
1
  production:
2
- adapter: mysql
2
+ adapter: mysql2
3
3
  username: root
4
4
  password: password
5
5
  host: localhost
data/lib/dindi/file_templates/1.9.1/models.rb.erb CHANGED
@@ -1,6 +1,8 @@
1
+ require 'mysql2'
1
2
  require 'activerecord'
2
3
 
3
4
  config = YAML.load_file('database.yml')
4
5
  ActiveRecord::Base.establish_connection(config["production"])
6
+ ActiveRecord::Base.include_root_in_json = false
5
7
 
6
8
  Dir.glob("<%= project_absolute_dir %>/models/*.rb").each {|model| require model}
data/lib/dindi/file_templates/1.9.2/models.rb.erb CHANGED
@@ -3,5 +3,6 @@ require 'active_record'
3
3
 
4
4
  config = YAML.load_file('database.yml')
5
5
  ActiveRecord::Base.establish_connection(config["production"])
6
+ ActiveRecord::Base.include_root_in_json = false
6
7
 
7
8
  Dir.glob("<%= project_absolute_dir %>/models/*.rb").each {|model| require model}
data/lib/dindi/file_templates/shared/docs.haml.erb CHANGED
@@ -3,7 +3,7 @@
3
3
  %title= if @page_title then "CMS " + @page_title.humanize else "CMS" end
4
4
  %meta{:content => "text/html; charset=utf-8", "http-equiv" => "Content-Type"}
5
5
  %meta{:content => "NONE,NOARCHIVE", :name => "robots"}
6
- %link{:href => "http://twitter.github.com/bootstrap/assets/css/bootstrap.css", :rel => "stylesheet", :type => "text/css"}
6
+ %link{:href => "http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-combined.min.css", :rel => "stylesheet", :type => "text/css"}
7
7
  :css
8
8
  body {
9
9
  padding-top: 20px;
@@ -20,14 +20,16 @@
20
20
  %table.table.table-striped
21
21
  %thead
22
22
  %tr
23
- %th{:width => "30%"} URL
24
- %th{:width => "70%"} Description
23
+ %th{:width => "10%"} Method
24
+ %th{:width => "45%"} URL
25
+ %th{:width => "45%"} Description
25
26
  %tfoot
26
27
  %tr
27
- %td{:colspan => "2"} Copyright &copy;2012
28
+ %td{:colspan => "3"} Copyright &copy;2013
28
29
  %tbody
29
30
  %tr
31
+ %td GET
30
32
  %td
31
33
  %a{:href => "http://servername.com"}
32
34
  http://servername
33
- %td (GET) Returns app cms
35
+ %td Returns app cms
data/lib/dindi/file_templates/shared/helpers.rb.erb CHANGED
@@ -5,7 +5,7 @@ module DebugOn
5
5
  logger.info(request.url)
6
6
  logger.info("Params:")
7
7
  params.each do |key, value|
8
- logger.info("\#{key} => \#{value}")
8
+ logger.info("#{key} => #{value}")
9
9
  end
10
10
  end
11
11
 
@@ -14,7 +14,7 @@ module DebugOn
14
14
  $APP_LOG.info(request.url)
15
15
  $APP_LOG.info("Params:")
16
16
  params.each do |key, value|
17
- $APP_LOG.info("\#{key} => \#{value}")
17
+ $APP_LOG.info("#{key} => #{value}")
18
18
  end
19
19
  end
20
20
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dindi
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.3
4
+ version: 0.6.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-06-21 00:00:00.000000000Z
12
+ date: 2013-04-16 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: colorize
16
- requirement: &70221267525300 !ruby/object:Gem::Requirement
16
+ requirement: !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70221267525300
24
+ version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
26
+ requirements:
27
+ - - ! '>='
28
+ - !ruby/object:Gem::Version
29
+ version: '0'
25
30
  - !ruby/object:Gem::Dependency
26
31
  name: bundler
27
- requirement: &70221267524740 !ruby/object:Gem::Requirement
32
+ requirement: !ruby/object:Gem::Requirement
28
33
  none: false
29
34
  requirements:
30
35
  - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
32
37
  version: 1.0.0
33
38
  type: :runtime
34
39
  prerelease: false
35
- version_requirements: *70221267524740
40
+ version_requirements: !ruby/object:Gem::Requirement
41
+ none: false
42
+ requirements:
43
+ - - ! '>='
44
+ - !ruby/object:Gem::Version
45
+ version: 1.0.0
36
46
  - !ruby/object:Gem::Dependency
37
47
  name: shoulda
38
- requirement: &70221267524180 !ruby/object:Gem::Requirement
48
+ requirement: !ruby/object:Gem::Requirement
39
49
  none: false
40
50
  requirements:
41
51
  - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
43
53
  version: '0'
44
54
  type: :development
45
55
  prerelease: false
46
- version_requirements: *70221267524180
56
+ version_requirements: !ruby/object:Gem::Requirement
57
+ none: false
58
+ requirements:
59
+ - - ! '>='
60
+ - !ruby/object:Gem::Version
61
+ version: '0'
47
62
  - !ruby/object:Gem::Dependency
48
63
  name: bundler
49
- requirement: &70221267523520 !ruby/object:Gem::Requirement
64
+ requirement: !ruby/object:Gem::Requirement
50
65
  none: false
51
66
  requirements:
52
67
  - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
54
69
  version: 1.0.0
55
70
  type: :development
56
71
  prerelease: false
57
- version_requirements: *70221267523520
72
+ version_requirements: !ruby/object:Gem::Requirement
73
+ none: false
74
+ requirements:
75
+ - - ! '>='
76
+ - !ruby/object:Gem::Version
77
+ version: 1.0.0
58
78
  - !ruby/object:Gem::Dependency
59
79
  name: jeweler
60
- requirement: &70221267522980 !ruby/object:Gem::Requirement
80
+ requirement: !ruby/object:Gem::Requirement
61
81
  none: false
62
82
  requirements:
63
83
  - - ~>
@@ -65,10 +85,15 @@ dependencies:
65
85
  version: 1.6.4
66
86
  type: :development
67
87
  prerelease: false
68
- version_requirements: *70221267522980
88
+ version_requirements: !ruby/object:Gem::Requirement
89
+ none: false
90
+ requirements:
91
+ - - ~>
92
+ - !ruby/object:Gem::Version
93
+ version: 1.6.4
69
94
  - !ruby/object:Gem::Dependency
70
95
  name: simplecov
71
- requirement: &70221267522340 !ruby/object:Gem::Requirement
96
+ requirement: !ruby/object:Gem::Requirement
72
97
  none: false
73
98
  requirements:
74
99
  - - ! '>='
@@ -76,7 +101,12 @@ dependencies:
76
101
  version: '0'
77
102
  type: :development
78
103
  prerelease: false
79
- version_requirements: *70221267522340
104
+ version_requirements: !ruby/object:Gem::Requirement
105
+ none: false
106
+ requirements:
107
+ - - ! '>='
108
+ - !ruby/object:Gem::Version
109
+ version: '0'
80
110
  description: This gem will create a modular base for a new Sinatra app
81
111
  email: samuelchandra@yahoo.com
82
112
  executables:
@@ -124,7 +154,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
124
154
  version: '0'
125
155
  segments:
126
156
  - 0
127
- hash: -4009206186577548076
157
+ hash: 4037155346142818555
128
158
  required_rubygems_version: !ruby/object:Gem::Requirement
129
159
  none: false
130
160
  requirements:
@@ -133,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
133
163
  version: '0'
134
164
  requirements: []
135
165
  rubyforge_project:
136
- rubygems_version: 1.8.10
166
+ rubygems_version: 1.8.23
137
167
  signing_key:
138
168
  specification_version: 3
139
169
  summary: Dindi is a hit of Sinatra