djatoka 0.0.12 → 0.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/VERSION +1 -1
  2. data/bin/djatoka_url +0 -0
  3. data/lib/djatoka/view_helpers.rb +27 -5
  4. metadata +4 -4
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.0.12
1
+ 0.1.0
data/bin/djatoka_url CHANGED
File without changes
data/lib/djatoka/view_helpers.rb CHANGED
@@ -22,7 +22,7 @@ module Djatoka
22
22
  def djatoka_image_tag(rft_id, params={})
23
23
  resolver, region = setup_djatoka_image_tag(rft_id, params)
24
24
  if resolver and region
25
- image_tag region.url, params
25
+ image_tag region.url, clean_image_tag_params(params)
26
26
  else
27
27
 
28
28
  end
@@ -37,7 +37,7 @@ module Djatoka
37
37
  def djatoka_square_image_tag(rft_id, params={})
38
38
  resolver, region = setup_djatoka_image_tag(rft_id, params)
39
39
  if resolver and region
40
- image_tag(region.square.url, params) #+ debug(region)
40
+ image_tag(region.square.url, clean_square_image_tag_params(params)) #+ debug(region)
41
41
  else
42
42
 
43
43
  end
@@ -47,7 +47,7 @@ module Djatoka
47
47
  def djatoka_top_left_square_image_tag(rft_id, params={})
48
48
  resolver, region = setup_djatoka_image_tag(rft_id, params)
49
49
  if resolver and region
50
- image_tag(region.top_left_square.url, params) #+ debug(region)
50
+ image_tag(region.top_left_square.url, clean_square_image_tag_params(params)) #+ debug(region)
51
51
  else
52
52
 
53
53
  end
@@ -56,7 +56,7 @@ module Djatoka
56
56
  def djatoka_bottom_right_square_image_tag(rft_id, params={})
57
57
  resolver, region = setup_djatoka_image_tag(rft_id, params)
58
58
  if resolver and region
59
- image_tag(region.bottom_right_square.url, params) #+ debug(region)
59
+ image_tag(region.bottom_right_square.url, clean_square_image_tag_params(params)) #+ debug(region)
60
60
  else
61
61
 
62
62
  end
@@ -67,7 +67,7 @@ module Djatoka
67
67
  def djatoka_smallbox_image_tag(rft_id, params={})
68
68
  resolver, region = setup_djatoka_image_tag(rft_id, params)
69
69
  if resolver and region
70
- image_tag region.smallbox.url, params
70
+ image_tag region.smallbox.url, clean_square_image_tag_params(params)
71
71
  else
72
72
 
73
73
  end
@@ -102,7 +102,11 @@ module Djatoka
102
102
  def setup_djatoka_image_tag(rft_id, params)
103
103
  resolver = determine_resolver(params)
104
104
  if resolver
105
+ metadata = Djatoka::Metadata.new(resolver, rft_id).perform
105
106
  region = Djatoka::Region.new(resolver, rft_id, params)
107
+ level = region.pick_best_level(metadata)
108
+ region.level level
109
+ region.query.delete(:scale)
106
110
  return resolver, region
107
111
  else
108
112
  end
@@ -119,6 +123,24 @@ module Djatoka
119
123
  nil
120
124
  end
121
125
  end
126
+
127
+ def clean_image_tag_params(params)
128
+ new_params = params.dup
129
+ if new_params[:scale]
130
+ new_params.delete(:scale)
131
+ end
132
+ new_params
133
+ end
134
+
135
+ def clean_square_image_tag_params(params)
136
+ new_params = params.dup
137
+ if new_params[:scale]
138
+ new_params[:height] = new_params[:scale] unless new_params[:height]
139
+ new_params[:width] = new_params[:scale] unless new_params[:width]
140
+ new_params.delete(:scale)
141
+ end
142
+ new_params
143
+ end
122
144
 
123
145
  end
124
146
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: djatoka
3
3
  version: !ruby/object:Gem::Version
4
- hash: 7
4
+ hash: 27
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
+ - 1
8
9
  - 0
9
- - 12
10
- version: 0.0.12
10
+ version: 0.1.0
11
11
  platform: ruby
12
12
  authors:
13
13
  - Jason Ronallo
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2011-08-02 00:00:00 -04:00
18
+ date: 2011-10-02 00:00:00 -04:00
19
19
  default_executable: djatoka_url
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency