hammock 0.4.0 → 0.4.2
Sign up to get free protection for your applications and to get access to all the features.
- data/History.txt +9 -0
- data/Rakefile +2 -0
- data/VERSION +1 -1
- data/hammock.gemspec +8 -2
- data/lib/hammock/monkey_patches/active_record.rb +5 -5
- data/lib/hammock/restful_rendering.rb +4 -4
- data/lib/hammock/scope.rb +4 -4
- data/lib/hammock.rb +1 -1
- metadata +23 -4
data/History.txt
CHANGED
@@ -1,3 +1,12 @@
|
|
1
|
+
== 0.4.2 2009-10-27
|
2
|
+
Check rendered_or_redirected? on XHR requests as well as normal ones.
|
3
|
+
Fix #ajaxinate to handle multiple entities.
|
4
|
+
|
5
|
+
|
6
|
+
== 0.4.1 2009-10-27
|
7
|
+
Updated Rakefile and gemspec to use jeweler.
|
8
|
+
|
9
|
+
|
1
10
|
== 0.4 2009-10-05
|
2
11
|
Fix #link_class_for to handle multiple entities.
|
3
12
|
Use SELECT DISTINCT in #suggest to eliminate duplicates caused by JOINs.
|
data/Rakefile
CHANGED
@@ -7,6 +7,8 @@ begin
|
|
7
7
|
gemspec.email = "ben@hoskings.net"
|
8
8
|
gemspec.homepage = "http://github.com/benhoskings/hammock"
|
9
9
|
gemspec.authors = ["Ben Hoskings"]
|
10
|
+
gemspec.add_dependency 'rails', '~> 2.3.0'
|
11
|
+
gemspec.add_dependency 'benhoskings-ambitious-activerecord', '~> 0.1.3.7'
|
10
12
|
end
|
11
13
|
rescue LoadError
|
12
14
|
puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.4.
|
1
|
+
0.4.2
|
data/hammock.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{hammock}
|
8
|
-
s.version = ""
|
8
|
+
s.version = "0.4.2"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Ben Hoskings"]
|
12
|
-
s.date = %q{2009-10-
|
12
|
+
s.date = %q{2009-10-27}
|
13
13
|
s.description = %q{}
|
14
14
|
s.email = %q{ben@hoskings.net}
|
15
15
|
s.extra_rdoc_files = [
|
@@ -81,9 +81,15 @@ Gem::Specification.new do |s|
|
|
81
81
|
s.specification_version = 3
|
82
82
|
|
83
83
|
if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
|
84
|
+
s.add_runtime_dependency(%q<rails>, ["~> 2.3.0"])
|
85
|
+
s.add_runtime_dependency(%q<benhoskings-ambitious-activerecord>, ["~> 0.1.3.7"])
|
84
86
|
else
|
87
|
+
s.add_dependency(%q<rails>, ["~> 2.3.0"])
|
88
|
+
s.add_dependency(%q<benhoskings-ambitious-activerecord>, ["~> 0.1.3.7"])
|
85
89
|
end
|
86
90
|
else
|
91
|
+
s.add_dependency(%q<rails>, ["~> 2.3.0"])
|
92
|
+
s.add_dependency(%q<benhoskings-ambitious-activerecord>, ["~> 0.1.3.7"])
|
87
93
|
end
|
88
94
|
end
|
89
95
|
|
@@ -99,11 +99,11 @@ module Hammock
|
|
99
99
|
record
|
100
100
|
end
|
101
101
|
end
|
102
|
-
|
103
|
-
def find_or_create_with! find_attributes, create_attributes = {}, adjust_attributes = false
|
104
|
-
|
105
|
-
|
106
|
-
end
|
102
|
+
|
103
|
+
# def find_or_create_with! find_attributes, create_attributes = {}, adjust_attributes = false)
|
104
|
+
# record = find_or_new_with find_attributes, create_attributes, adjust_attributes
|
105
|
+
# record.valid? ? record : raise("Save failed. #{record.errors.inspect}")
|
106
|
+
# end
|
107
107
|
|
108
108
|
end
|
109
109
|
|
@@ -13,12 +13,12 @@ module Hammock
|
|
13
13
|
private
|
14
14
|
|
15
15
|
def render_or_redirect_after result
|
16
|
-
if
|
16
|
+
if rendered_or_redirected?
|
17
|
+
log "Already rendered or redirected."
|
18
|
+
elsif request.xhr?
|
17
19
|
render_for_safe_actions result, :editable => true, :edit => false
|
18
20
|
else
|
19
|
-
if
|
20
|
-
log "Already rendered or redirected."
|
21
|
-
elsif postsave_render result
|
21
|
+
if postsave_render result
|
22
22
|
# rendered - no redirect
|
23
23
|
elsif result
|
24
24
|
render_http_success
|
data/lib/hammock/scope.rb
CHANGED
@@ -28,10 +28,10 @@ module Hammock
|
|
28
28
|
resource = entities.last
|
29
29
|
route = route_for verb, *entities
|
30
30
|
if route.safe? && !resource.indexable_by(current_user)
|
31
|
-
|
31
|
+
dlog "#{requester_name} can't index #{resource.name.pluralize}. #{describe_call_point 4}"
|
32
32
|
:not_found
|
33
33
|
elsif !route.safe? && !make_createable(resource)
|
34
|
-
|
34
|
+
dlog "#{requester_name} can't #{verb} #{resource.name.pluralize}. #{describe_call_point 4}"
|
35
35
|
:read_only
|
36
36
|
else
|
37
37
|
# dlog "#{requester_name} can #{verb} #{resource.name.pluralize}."
|
@@ -45,11 +45,11 @@ module Hammock
|
|
45
45
|
route = route_for verb, *entities
|
46
46
|
if route.verb.in?(:save, :create) && record.new_record?
|
47
47
|
returning record.createable_by?(current_user) ? :ok : :unauthed do |result|
|
48
|
-
|
48
|
+
dlog "#{requester_name} can#{"'t" unless result == :ok} create a #{record.class} with #{record.attributes.inspect}. #{describe_call_point 4}"
|
49
49
|
end
|
50
50
|
else
|
51
51
|
returning record_in_scope?(route, record) ? :ok : :not_found do |result|
|
52
|
-
|
52
|
+
dlog "#{requester_name} can#{"'t" unless result == :ok} #{verb} #{record.class}<#{record.id}>. #{describe_call_point 4}"
|
53
53
|
end
|
54
54
|
end
|
55
55
|
end
|
data/lib/hammock.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: hammock
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.4.
|
4
|
+
version: 0.4.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ben Hoskings
|
@@ -9,10 +9,29 @@ autorequire:
|
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
11
|
|
12
|
-
date: 2009-10-
|
12
|
+
date: 2009-10-27 00:00:00 +11:00
|
13
13
|
default_executable:
|
14
|
-
dependencies:
|
15
|
-
|
14
|
+
dependencies:
|
15
|
+
- !ruby/object:Gem::Dependency
|
16
|
+
name: rails
|
17
|
+
type: :runtime
|
18
|
+
version_requirement:
|
19
|
+
version_requirements: !ruby/object:Gem::Requirement
|
20
|
+
requirements:
|
21
|
+
- - ~>
|
22
|
+
- !ruby/object:Gem::Version
|
23
|
+
version: 2.3.0
|
24
|
+
version:
|
25
|
+
- !ruby/object:Gem::Dependency
|
26
|
+
name: benhoskings-ambitious-activerecord
|
27
|
+
type: :runtime
|
28
|
+
version_requirement:
|
29
|
+
version_requirements: !ruby/object:Gem::Requirement
|
30
|
+
requirements:
|
31
|
+
- - ~>
|
32
|
+
- !ruby/object:Gem::Version
|
33
|
+
version: 0.1.3.7
|
34
|
+
version:
|
16
35
|
description: ""
|
17
36
|
email: ben@hoskings.net
|
18
37
|
executables: []
|