ropenlayer 0.3.0 → 0.3.1

data/Gemfile.lock

@@ -0,0 +1,99 @@
+PATH
+  remote: .
+  specs:
+    ropenlayer (0.3.1)
+      json_pure (~> 1.2.3)
+      rails (~> 3.0.3)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.3)
+      actionpack (= 3.0.3)
+      mail (~> 2.2.9)
+    actionpack (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.6)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+    activesupport (3.0.3)
+    arel (2.0.6)
+    builder (2.1.2)
+    columnize (0.3.1)
+    diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    i18n (0.5.0)
+    json_pure (1.2.3)
+    linecache (0.43)
+    mail (2.2.15)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.3)
+      actionmailer (= 3.0.3)
+      actionpack (= 3.0.3)
+      activerecord (= 3.0.3)
+      activeresource (= 3.0.3)
+      activesupport (= 3.0.3)
+      bundler (~> 1.0)
+      railties (= 3.0.3)
+    railties (3.0.3)
+      actionpack (= 3.0.3)
+      activesupport (= 3.0.3)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
+    rake (0.8.7)
+    rspec (2.3.0)
+      rspec-core (~> 2.3.0)
+      rspec-expectations (~> 2.3.0)
+      rspec-mocks (~> 2.3.0)
+    rspec-core (2.3.1)
+    rspec-expectations (2.3.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.3.0)
+    ruby-debug (0.10.3)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.3.0)
+    ruby-debug-base (0.10.3)
+      linecache (>= 0.3)
+    thor (0.14.6)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.23)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  json_pure (~> 1.2.3)
+  rails (~> 3.0.3)
+  ropenlayer!
+  rspec (~> 2.3.0)
+  ruby-debug (~> 0.10.3)

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.3.1
+* Bug fixes
+  * Ropenlayer::JsHelper::Prototype doesnt escape onclick propierties propierly :)
+* enhancement
+  * default_layer can be used now in instance space (though Proc, symbol method, or watever). Instance maps can have now independent base layer
+
 === 0.3.0 2011-02-27
 
 * Major release.

data/lib/ropenlayer/acts_as/mapper.rb

@@ -123,10 +123,10 @@ module Ropenlayer
           # Set default localization if avalaible
           # Longitude and latitude are parsed by default as float if Proc or Symbol are not defined. Zoom, by default, as integer
           def set_map_localization(config)
-            defult_localization_values = { :longitude => :to_f, :latitude => :to_f, :zoom => :to_i }
+            defult_localization_values = { :longitude => :to_f, :latitude => :to_f, :zoom => :to_i, :default_layer => :to_sym }
             
-            defult_localization_values.each do |axis, default_method|
-              eval_value = config.delete(axis)
+            defult_localization_values.each do |name, default_method|
+              eval_value = config.delete(name)
               value      = 0
               case eval_value
                 when Symbol
@@ -136,7 +136,7 @@ module Ropenlayer
                 else
                   value = eval_value.send(default_method)
                 end
-              config[axis] = value unless value.to_i.zero?
+              config[name] = value unless value.to_i.zero?
             end
             config
           end     

data/lib/ropenlayer/js_helper/prototype.rb

@@ -5,8 +5,12 @@ module Ropenlayer
       def self.create_xhtml_element(element_type, attributes = {})
         inner_html     = attributes.delete(:inner_html)
         
+        attributes.each do |name, value|
+          attributes[name] = %( "#{ value }" ) if name.to_s.match(/^on/)
+        end
+        
         return_js      = Ropenlayer::Openlayer::Js.new_method("Element", :args => [ "'#{ element_type }'" ], :propierties => attributes)
-        return_js.body << ".update(#{ inner_html })" if inner_html
+        return_js.body << ".update('#{ inner_html.gsub("'",'') }')" if inner_html
         return_js.to_s
       end
       

data/lib/ropenlayer/node.rb

@@ -5,15 +5,12 @@ module Ropenlayer
     
     set_table_name :ropenlayer_nodes
 
-    GEOMETRY_TYPES = %w( POINT LINESTRING POLYGON )
+    GEOMETRY_TYPES = %w( POINT LINESTRING POLYGON ) unless defined?(GEOMETRY_TYPES)
     
     belongs_to :map,      :polymorphic => true
     
     has_many :localizations, :class_name => 'Ropenlayer::Localization'
     
-    has_one :icon,     :class_name => 'Ropenlayer::Icon'
-    has_one :category, :class_name => 'Ropenlayer::Category'
-    
    
     def geometry_string
       "#{ geometry }(#{ localizations.map{|l| "#{ l.longitude } #{ l.latitude }"}.join(',')})"

data/lib/ropenlayer/openlayer/map.rb

@@ -87,6 +87,7 @@ module Ropenlayer
         @js_propierties = map_js_propierties(options[:map_js_options])
         
         @layer_names    = @options[:layers]   || self.class.default_layers
+        
         if options[:default_layer]
           def_layer    = @layer_names.delete(options[:default_layer])
           @layer_names =  @layer_names.push(def_layer).reverse if def_layer

data/lib/ropenlayer.rb

@@ -2,12 +2,15 @@ $:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) ||
 
 # Rubygems and Rails Stuff
 require 'rubygems'
+
+# Require them
 require 'rails'
 require 'active_record'
 
+
 module Ropenlayer
   
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
   
   autoload :Node,               'ropenlayer/node'
   autoload :Localization,       'ropenlayer/localization'
@@ -43,14 +46,19 @@ module Ropenlayer
     end
   end
   
-  
+  # js_helper provides access to js framework constructor. Define your own at Rails.root + "config/initializers/ropenlayer.rb"
+  # By default Jquery is used
   mattr_accessor :js_helper
   @@js_helper = Ropenlayer::JsHelper::Jquery
   
+  # Configure ropenlayer module variables though config/initializers/ropenlayer.rb
   def self.setup
     yield self
   end
   
+  # Extend ActiveRecord with ActsAs behavior.
+  # Extend also FormBuilder
+  # FIXME support Formstatic
   class Railtie < Rails::Railtie
     initializer 'ropenlayer.initialize' do
       ActiveRecord::Base.extend Ropenlayer::ActsAs

data/ropenlayer.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
 
   # define gem
   s.name        = "ropenlayer"
-  s.version     = Ropenlayer::VERSION
+  s.version     =  '0.3.1'
   s.summary     = "Ropenlayer is a wrapper constructor for openlayer javascript library written in ruby. It aims to provide an easy way to build maps and display it on webs."
   s.description = "Ropenlayer is a wrapper constructor for openlayer javascript library written in ruby. It aims to provide an easy way to build maps and display it on webs."
   s.authors     = ['Gnoxys' ]
@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   # dependencies
   s.add_runtime_dependency('json_pure', '~> 1.2.3')
   s.add_runtime_dependency('rails', '~> 3.0.3')
+  s.add_runtime_dependency('activerecord', '~> 3.0.3')
   s.add_development_dependency('rspec', '~> 2.3.0')
   if RUBY_VERSION < '1.9'
     s.add_development_dependency('ruby-debug', '~> 0.10.3')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ropenlayer
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Gnoxys
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-07 00:00:00 +01:00
+date: 2011-03-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,9 +51,25 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: activerecord
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 3
+        - 0
+        - 3
+        version: 3.0.3
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -65,11 +81,11 @@ dependencies:
         - 0
         version: 2.3.0
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: ruby-debug
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -81,7 +97,7 @@ dependencies:
         - 3
         version: 0.10.3
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 description: Ropenlayer is a wrapper constructor for openlayer javascript library written in ruby. It aims to provide an easy way to build maps and display it on webs.
 email: 
 - development@gnoxys.net
@@ -94,6 +110,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - History.txt
 - Manifest.txt
 - PostInstall.txt
@@ -153,9 +170,7 @@ files:
 - lib/ropenlayer/acts_as.rb
 - lib/ropenlayer/acts_as/mapper.rb
 - lib/ropenlayer/acts_as/nodeable.rb
-- lib/ropenlayer/category.rb
 - lib/ropenlayer/form_builder.rb
-- lib/ropenlayer/icon.rb
 - lib/ropenlayer/js_helper/jquery.rb
 - lib/ropenlayer/js_helper/prototype.rb
 - lib/ropenlayer/localization.rb

data/lib/ropenlayer/category.rb

@@ -1,14 +0,0 @@
-module Ropenlayer
-  class Category < ActiveRecord::Base
-    
-    set_table_name    :ropenlayer_categories
-    
-    belongs_to        :mapper, :polymorphic => true
-    
-    #before_save       :ensure_format, Proc.new {|category| category.color.match(/^\#/) ? '' : category.color = "##{ category.color }"   
-
-  end
-  
-  
-  
-end

data/lib/ropenlayer/icon.rb

@@ -1,12 +0,0 @@
-module Ropenlayer
-  class Icon < ActiveRecord::Base
-    
-    set_table_name    :ropenlayer_icons
-    
-    belongs_to        :mapper, :polymorphic => true
-    
-    #has_attached_file :logo, :styles => { :'48' => "48x48", :'64' => "64x64", :'128' => "128x128", :'256' => "256x256" }
-
-  end
-  
-end