ropenlayer 0.3.3 → 0.3.4

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    ropenlayer (0.3.3)
-      activerecord (~> 3.0.3)
+    ropenlayer (0.3.4)
+      activerecord (>= 3.0.3)
       json_pure (~> 1.5.1)
-      rails (~> 3.0.3)
+      rails (>= 3.0.3)
 
 GEM
   remote: http://rubygems.org/

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.3.4 2011-05-09
+* Improves
+  * Added some test with rspec
+  * improve node drawing. all style variables can now be defined in acts_as_localizable_on method
+
 === 0.3.3
 * Malformed previous release
 

data/lib/ropenlayer/acts_as/nodeable.rb

@@ -69,10 +69,11 @@ module Ropenlayer
 
           def node_data
             attributes_config = self.class.ropenlayer_node_config[:attributes] || {}
-            
-            node_map_attributes   = { }
-            [ :name, :popup_content, :icon_url, :color ].each do |attribute|
-              node_map_attributes[attribute] = eval_node_attribute(attributes_config[attribute]) unless attributes_config[attribute].nil?
+            #[ :name, :popup_content, :icon_url, :color ].each do |attribute|
+            node_map_attributes = Ropenlayer::Openlayer::Feature.all_attributes.inject({}) do |hash, attribute|
+
+              hash[attribute] = eval_node_attribute(attributes_config[attribute]) unless attributes_config[attribute].nil?
+              hash
             end
             
             if self.node.localizations.any?

data/lib/ropenlayer/node.rb

@@ -26,8 +26,14 @@ module Ropenlayer
         self.localizations << self.localizations.new(:longitude => data.split.first, :latitude => data.split.last, :order => order = order.next)
       end
     end
-
     
+    def main_latitude
+      self.localizations.first ? self.localizations.first.latitude : nil
+    end
+    
+    def main_longitude
+      self.localizations.first ? self.localizations.first.longitude : nil
+    end
   end
   
 end

data/lib/ropenlayer/openlayer/feature.rb

@@ -2,12 +2,45 @@ module Ropenlayer
   module Openlayer
     class Feature
       
-      DEFAULT_ICON_SIZE  = [ 40, 34 ]
-      DEFAULT_ICON_URL   = "/images/ropenlayer/default_marker.png"
-      DEFAULT_POPUP_SIZE = [ 600, 400 ]
-      
       attr_reader :map
       
+      def self.default_attributes
+        { # Style Attributes
+          :style => {
+            :cursor           => 'pointer',
+            :graphic_width     => 32,
+            :graphic_height    => 32,      
+            :stroke_color      => '#008600',
+            :stroke_opacity    => 0.9,
+            :stroke_width      => 2,
+            :fill_color        => '#008600',
+            :fill_opacity      => 0.9,
+            :point_radius      => 5,
+            :pointer_events    => 'visiblePainted',
+            :font_size         => '12px',
+            :font_weight       => 'bold'
+          },
+          :render => { 
+            # Render Attributes
+            :name              => 'Another Feature',
+            :icon_url          => '/images/ropenlayer/default_marker.png',
+            :icon_size         => [ 40, 34 ],
+            # iccon offsset attribute must be writen as js code. 
+            # x offset (first value) and y offset (last value) should maybe fixed values or mathematical operations with size var who is actually icon_size x and y values... 
+            # for example, to offset half of icon dimensions, just type
+            # [ '-(size.w/2)', '-(size.h/2)' ]
+            :icon_offset       => ['-(size.w/2)', '-(size.h/2)'],
+            :popup_size        => [ 600, 400 ],
+            :popup_bgcolor     => '#16b87d',
+            :popup_content     => false
+          }
+        }
+      end
+      
+      def self.all_attributes
+        default_attributes.map{|attr| attr.last.keys }.flatten
+      end
+  
       def self.draw_collection(map_object)
         features = map_object.draw_features
         feature_objects = features.inject([]) do |objects, feature_data|
@@ -22,18 +55,23 @@ module Ropenlayer
         @map           = map
         @id            = attributes[:id]            || raise("No defined id for feature #{ attributes.inspect }")      
         @js_id         = "#{ @map.js_id }node#{ @id }"
-        @name          = attributes[:name]          || 'Another Feature'
-        @popup_content = attributes[:popup_content] || false
         @geometry      = attributes[:geometry]      || raise("No defined geometry for feature #{ attributes.inspect }")
         @longitude     = attributes[:longitude]     || raise("No defined longitude for feature #{ attributes.inspect }")
         @latitude      = attributes[:latitude]      || raise("No defined latitude for feature #{ attributes.inspect }")
-        @icon_url      = attributes[:icon_url]
-        @icon_size     = attributes[:icon_size]
-        @popup_size    = attributes[:popup_size]
-        @color         = attributes[:color]
         @localizations = attributes[:localizations]
+
+        @attributes    = attributes
+        @name          = attributes[:name]           || 'Another Feature'
+        
+        [:icon_url, :popup_content, :popup_bgcolor ].each do |render_attribute|
+          build_render_attribute(render_attribute, String)
+        end
+        [:icon_size, :popup_size, :icon_offset ].each do |render_attribute|
+          build_render_attribute(render_attribute, Array)
+        end
+        
       end
-      
+
       def to_js
         %( #{ build_main_geometry  }
            #{ build_vector_feature }
@@ -44,8 +82,6 @@ module Ropenlayer
            
            #{  Ropenlayer::Openlayer::Js.new("#{ @map.markers_layer.js_id }.addMarker(#{  @js_id }MainMarker)").to_js } 
            #{  Ropenlayer::Openlayer::Js.new("#{ @map.vectors_layer.js_id }.addFeatures([#{  @js_id }VectorFeature, #{  @js_id }MainFeature])").to_js } 
-           
-           
         )
         
       end
@@ -78,17 +114,14 @@ module Ropenlayer
       def build_vector_feature
         vector_feature_method = Ropenlayer::Openlayer::Js.new_method("OpenLayers.Feature.Vector", :args => [ "#{ @js_id }MainGeometry" ]).to_s
         %( #{ Ropenlayer::Openlayer::Js.new_var("#{ @js_id }VectorFeature", vector_feature_method).to_js }
-           #{ Ropenlayer::Openlayer::Js.new("#{ @js_id }VectorFeature.attributes = { name: '#{ @name }', favColor: 'red', fillColor: '#{ @color }' }").to_js } )
+           #{ Ropenlayer::Openlayer::Js.new("#{ @js_id }VectorFeature.attributes = #{ build_vector_style_attributes_name.to_json }").to_js } )
       end
-        
-      def build_main_icon
-        icon_size   = (@icon_size and @icon_size.is_a?(Array)) ? @icon_size : DEFAULT_ICON_SIZE
-        icon_url    = (@icon_url  and @icon_url.is_a?(String)) ? @icon_url  : DEFAULT_ICON_URL
 
-        size_method   = Ropenlayer::Openlayer::Js.new_method("OpenLayers.Size", :args => icon_size).to_s
-        offset_method = Ropenlayer::Openlayer::Js.new("function(size){ return new OpenLayers.Pixel(-(size.w/2), -(size.h*2)) }").to_s
-        
-        icon_method   = Ropenlayer::Openlayer::Js.new_method("OpenLayers.Icon", :args => [ "'#{ icon_url }'", size_method, 'null', offset_method ]).to_s
+      def build_main_icon
+        size_method   = Ropenlayer::Openlayer::Js.new_method("OpenLayers.Size", :args  => @icon_size).to_s
+        pixel_method  = Ropenlayer::Openlayer::Js.new_method("OpenLayers.Pixel", :args => @icon_offset).to_s
+        offset_method = Ropenlayer::Openlayer::Js.new("function(size){ return #{ pixel_method } }").to_s
+        icon_method   = Ropenlayer::Openlayer::Js.new_method("OpenLayers.Icon", :args => [ "'#{ @icon_url }'", size_method, 'null', offset_method ]).to_s
         %( #{ Ropenlayer::Openlayer::Js.new_var("#{ @js_id }Icon", icon_method).to_js } )
       end
 
@@ -101,11 +134,10 @@ module Ropenlayer
       end
       
       def build_marker_click_function
-        popup_size = (@popup_size and @popup_size.is_a?(Array)) ? @popup_size : DEFAULT_POPUP_SIZE
         function_content = %( 
           if (this.popup == null) {
             this.popup = this.createPopup(true);
-            this.popup.setSize = function(size) { return new OpenLayers.Size(#{ popup_size.join)(',') }); };
+            this.popup.setSize = function(size) { return new OpenLayers.Size(#{ @popup_size.join(',') }); };
             this.popup.setBackgroundColor('#16b87d');
             this.popup.setContentHTML('#{ @popup_content.gsub("'","") }');
             #{ @map.js_id }.addPopup(this.popup);
@@ -113,11 +145,24 @@ module Ropenlayer
           } else {
             this.popup.toggle();
           }
-          OpenLayers.Event.stop(evt);
+          //OpenLayers.Event.stop(evt);
         )
         %( #{ Ropenlayer::Openlayer::Js.new_var("#{ @js_id}MarkerClickFunction", "function(event) {#{ function_content }}").to_js }
            #{ Ropenlayer::Openlayer::Js.new("#{  @js_id }MainMarker.events.register('mousedown', #{ @js_id }MainFeature, #{ @js_id}MarkerClickFunction)").to_js } )
       end
+      
+      def build_vector_style_attributes_name
+        style_attributes = self.class.default_attributes[:style].keys
+        style_attributes.inject({}) do |hash, attribute|
+          hash[attribute] = @attributes[attribute] || self.class.default_attributes[:style][attribute]
+          hash
+        end
+      end
+      
+      def build_render_attribute(attribute, should_be_klass)
+        value = (@attributes[attribute] and @attributes[attribute].is_a?(should_be_klass)) ? @attributes[attribute] : self.class.default_attributes[:render][attribute]
+        instance_variable_set("@#{ attribute }", value)
+      end
     end
   end
 end

data/lib/ropenlayer/openlayer/layer/elements_vector.rb

@@ -10,24 +10,38 @@ module Ropenlayer
         private
         def self.layers_config
           { :vector_elements  => { :method      => "OpenLayers.Layer.Vector",
-                                  :args        => [ "'Capa de Elementos'" ],
-                                  :propierties => { :styleMap => "#{ Ropenlayer::Openlayer::Js.new_method("OpenLayers.StyleMap", :propierties => { :default => default_vector_style_parameters.to_json }) }" },
-                                  :description => 'Capa para marcadores de elements' } }
+                                   :args        => [ "'Capa de Elementos'" ],
+                                   :propierties => { :styleMap => "#{ Ropenlayer::Openlayer::Js.new_method("OpenLayers.StyleMap", :propierties => { :default => default_vector_style_parameters.to_json }) }" },
+                                   :description => 'Capa para marcadores de elements' } }
         end
         
         def self.default_vector_style_parameters
-          { :cursor           => 'normal',
-            :graphicWidth     =>  48,
-            :graphicHeight    =>  48,      
-            :strokeColor      =>  '${fillColor}',
-            :strokeOpacity    =>  0.8,
-            :strokeWidth      =>  5,
-            :fillColor        =>  '${fillColor}',
-            :fillOpacity      =>  0.8,
-            :pointRadius      =>  30,
-            :pointerEvents    =>  'visiblePainted',
-            :fontSize         =>  '12px',
-            :fontWeight       =>  'bold' }
+          { :cursor           => '${cursor}',
+            :graphicWidth     => '${graphic_width}',
+            :graphicHeight    => '${graphic_height}',      
+            :strokeColor      => '${stroke_color}',
+            :strokeOpacity    => '${stroke_opacity}',
+            :strokeWidth      => '${stroke_width}',
+            :fillColor        => '${fill_color}',
+            :fillOpacity      => '${fill_opacity}',
+            :pointRadius      => '${point_radius}',
+            :pointerEvents    => '${pointer_events}',
+            :fontSize         => '${font_size}',
+            :fontWeight       => '${font_weight}' 
+          }   
+          
+#           { :cursor           => 'normal',
+#             :graphicWidth     =>  48,
+#             :graphicHeight    =>  48,      
+#             :strokeColor      =>  '${fillColor}',
+#             :strokeOpacity    =>  0.8,
+#             :strokeWidth      =>  5,
+#             :fillColor        =>  '${fillColor}',
+#             :fillOpacity      =>  0.8,
+#             :pointRadius      =>  30,
+#             :pointerEvents    =>  'visiblePainted',
+#             :fontSize         =>  '12px',
+#             :fontWeight       =>  'bold' }
         end
       end
     end

data/lib/ropenlayer/version.rb

@@ -1,3 +1,3 @@
 module Ropenlayer
-  VERSION = "0.3.3" unless defined? Ropenlayer::VERSION
+  VERSION = "0.3.4" unless defined? Ropenlayer::VERSION
 end

data/ropenlayer.gemspec

@@ -14,9 +14,10 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.split("\n")
 
   # dependencies
-  s.add_dependency('json_pure', '~> 1.5.1')
-  s.add_dependency('rails', '~> 3.0.3')
-  s.add_dependency('activerecord', '~> 3.0.3')
+  s.add_dependency 'json_pure', '~> 1.5.1'
+  s.add_dependency 'rails',     '>=3.0.3'
+  s.add_dependency 'activerecord', '>=3.0.3'
+
   s.add_development_dependency('rspec', '~> 2.5.0')
   s.add_development_dependency('jasmine', '~> 1.0.2.0')
 

data/spec/ropenlayer/feature_spec.rb

@@ -0,0 +1,39 @@
+
+require File.join(File.dirname(__FILE__),'../../lib/ropenlayer.rb')
+
+describe Ropenlayer do
+  describe Ropenlayer::Openlayer do
+    describe Ropenlayer::Openlayer::Feature do
+      
+      before(:all) do
+        @test_map       = Ropenlayer::Openlayer::Map.new('test')
+        @valid_options  = { :id => 'test_feature', :geometry => 'POINT', :longitude => 0, :latitude => 0 }
+        @render_options = @valid_options.merge({ :name => 'NOT another feature', :icon_url => '/example', :icon_size => [1,1],
+                                                 :popup_size => [1,1], :popup_content => 'hay' })
+      end
+      
+      it "should create a new instance given valid attributes. and obtaine default values" do
+        feature = Ropenlayer::Openlayer::Feature.new(@test_map, @valid_options)
+        feature.class.should == Ropenlayer::Openlayer::Feature
+        feature.instance_variable_get("@name").should          == 'Another Feature'
+        feature.instance_variable_get("@icon_url").should      == '/images/ropenlayer/default_marker.png'
+        feature.instance_variable_get("@icon_size").should     ==  [40, 34 ]
+        feature.instance_variable_get("@popup_size").should    == [ 600, 400 ]
+        feature.instance_variable_get("@popup_content").should == false
+      end
+      
+      it "should have recognize changes in render values" do
+        feature = Ropenlayer::Openlayer::Feature.new(@test_map, @render_options)
+        feature.class.should == Ropenlayer::Openlayer::Feature
+        feature.instance_variable_get("@name").should          == 'NOT another feature'
+        feature.instance_variable_get("@icon_url").should      == '/example'
+        feature.instance_variable_get("@icon_size").should     == [1, 1 ]
+        feature.instance_variable_get("@popup_size").should    == [ 1, 1 ]
+        feature.instance_variable_get("@popup_content").should == 'hay'
+      end
+
+    end
+    
+    
+  end
+end

data/spec/ropenlayer/map_spec.rb

@@ -0,0 +1,24 @@
+
+require File.join(File.dirname(__FILE__),'../../lib/ropenlayer.rb')
+
+describe Ropenlayer do
+  describe Ropenlayer::Openlayer do
+    describe Ropenlayer::Openlayer::Map do
+      it "should create a new instance given valid attributes" do
+        map = Ropenlayer::Openlayer::Map.new('test')
+        map.class.should ==  Ropenlayer::Openlayer::Map
+      end
+      
+      it "should have default values then" do
+        map = Ropenlayer::Openlayer::Map.new('test')
+        map.js_id.should == 'olObject_test'
+        map.div_id.should == 'test'
+        
+      
+      end
+      
+    end
+    
+    
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ropenlayer
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Gnoxys
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-08 00:00:00 +02:00
+date: 2011-05-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,7 +38,7 @@ dependencies:
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 1
         segments: 
@@ -54,7 +54,7 @@ dependencies:
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 1
         segments: 
@@ -215,6 +215,8 @@ files:
 - spec/javascripts/support/jasmine_config.rb
 - spec/javascripts/support/jasmine_runner.rb
 - spec/javascripts/support/run.html.erb
+- spec/ropenlayer/feature_spec.rb
+- spec/ropenlayer/map_spec.rb
 has_rdoc: true
 homepage: http://gitorious.org/gnoxys/ropenlayer
 licenses: []