ninoxe 1.1.0 → 1.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Njg5Yzg4YjEzOWIyZGUxNjc2MWU5YTEzMWYyOThiZTVjZmFlZjI1Yg==
+    MjI5NWI3ODA1YWU1ZDQyNGNlNmE5NGRiOWFlOWJhMTczYjk1MDA1OQ==
   data.tar.gz: !binary |-
-    N2YzZmUzM2Y1MzYyNWYwMDI0MWViOGQzODQzNGEyYjY5MzY2NDY0Yg==
+    YjM0Nzg2MjNmMDI4YTM3NDJlNjY0ODkxNDAzMmRjMGIzODYzYTM5OQ==
 SHA512:
   metadata.gz: !binary |-
-    YzUzNWM2ZWQwMmE4ODkzODYxZGZjNmE2MzViOGUzY2U4NDFiNTE0ZmQ5MDg5
-    ODkzZTJmNjY0YjU2MDdhNThiZWUzYzAxNTQ0N2VlN2U2Y2Q4NTI2NmRhZDJj
-    YjY3MTk5Y2Y4MmQzM2Q0MTJkODUyOTJlMDQzNDVlOGU3ZmJkZTA=
+    MjA4M2E1NjkxMDg5Zjk2N2YwYjNlZGY0ZTZjYWU1NDZkNDIyNTQ2YTIyZTQ4
+    MTJlOWRmMWM4YTFjNjc4YjUzNTNjZDdjMzQyYjUyYjJhMmNmMWQzN2Y0NDlh
+    YzU3ZTM3NjczN2RkYTM4ZTk0YzQyYjExYWUxNTlkNzkyMWNiMzU=
   data.tar.gz: !binary |-
-    MDYwZWI4OTZmMDUzNzE0NjRhZjI5OGQ0NzVmZDg4ZjlmMTc2M2Q3ODY5Njk1
-    MTU3YzQ2OWIwYzZiODczMTUyNzQ2ZTBjNWE3OTIwYjlmYjcwZWE1NTA1ZDk3
-    ZGMwOTQzNmEwNzY2NTY4MTYxZDFiOGZlZTFlZjVjMjNlMGY2ZDg=
+    YWM1MmUwY2IwMmVkYmIxZjM1MGUxMjNkY2U4MWM5NTRhM2Y3ZWYwZjRlMDBm
+    NjIzYmNlNjk4N2E1YWEwM2MwZjI5ZDdkYmRkNGY1ZWViNmY1NmY2Y2IzNGEz
+    ZGU3ZTYzNTAwMTJlNjZiMjc4ZGM5YWI2YmMxMTQ3MTkxZGJmMzc=

data/app/models/chouette/company.rb

@@ -9,9 +9,12 @@ class Chouette::Company < Chouette::TridentActiveRecord
 
   attr_accessible :objectid, :object_version, :creation_time, :creator_id, :name, :short_name
   attr_accessible :organizational_unit, :operating_department_name, :code, :phone, :fax, :email, :registration_number
+  attr_accessible :url, :time_zone
+
+  validates_format_of :url, :with => %r{\Ahttps?:\/\/([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?\Z}, :allow_nil => true, :allow_blank => true
  
   def self.nullable_attributes
-    [:organizational_unit, :operating_department_name, :code, :phone, :fax, :email]
+    [:organizational_unit, :operating_department_name, :code, :phone, :fax, :email, :url, :time_zone]
   end
   
 

data/app/models/chouette/line.rb

@@ -16,6 +16,7 @@ class Chouette::Line < Chouette::TridentActiveRecord
 
   has_and_belongs_to_many :group_of_lines, :class_name => 'Chouette::GroupOfLine', :order => 'group_of_lines.name'
   attr_accessible :group_of_lines, :group_of_line_ids, :group_of_line_tokens
+  attr_accessible :url, :color, :text_color
   attr_reader :group_of_line_tokens
 
   validates_presence_of :network
@@ -23,12 +24,15 @@ class Chouette::Line < Chouette::TridentActiveRecord
 
   validates_presence_of :registration_number
   validates_uniqueness_of :registration_number
-  validates_format_of :registration_number, :with => %r{\A[0-9A-Za-z_-]+\Z}
+  validates_format_of :registration_number, :with => %r{\A[\d\w_\-]+\Z}
+  validates_format_of :url, :with => %r{\Ahttps?:\/\/([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?\Z}, :allow_nil => true, :allow_blank => true
+  validates_format_of :color, :with => %r{\A[0-9a-fA-F]{6}\Z}, :allow_nil => true, :allow_blank => true
+  validates_format_of :text_color, :with => %r{\A[0-9a-fA-F]{6}\Z}, :allow_nil => true, :allow_blank => true
 
   validates_presence_of :name
   
   def self.nullable_attributes
-    [:published_name, :number, :comment]
+    [:published_name, :number, :comment, :url, :color, :text_color]
   end
 
   def geometry_presenter

data/app/models/chouette/stop_area.rb

@@ -23,9 +23,10 @@ class Chouette::StopArea < Chouette::TridentActiveRecord
   attr_accessible :country_code, :street_name, :zip_code, :city_name
   attr_accessible :mobility_restricted_suitability, :stairs_availability, :lift_availability, :int_user_needs
   attr_accessible :coordinates
+  attr_accessible :url, :time_zone
   
   validates_uniqueness_of :registration_number, :allow_nil => true, :allow_blank => true
-  validates_format_of :registration_number, :with => %r{\A[0-9A-Za-z_-]+\Z}, :allow_blank => true
+  validates_format_of :registration_number, :with => %r{\A[\d\w_\-]+\Z}, :allow_blank => true
   validates_presence_of :name
   validates_presence_of :area_type
 
@@ -35,9 +36,11 @@ class Chouette::StopArea < Chouette::TridentActiveRecord
   validates_numericality_of :longitude, :less_than_or_equal_to => 180, :greater_than_or_equal_to => -180, :allow_nil => true
 
   validates_format_of :coordinates, :with => %r{\A *-?(0?[0-9](\.[0-9]*)?|[0-8][0-9](\.[0-9]*)?|90(\.[0]*)?) *\, *-?(0?[0-9]?[0-9](\.[0-9]*)?|1[0-7][0-9](\.[0-9]*)?|180(\.[0]*)?) *\Z}, :allow_nil => true, :allow_blank => true
+  validates_format_of :url, :with => %r{\Ahttps?:\/\/([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?\Z}, :allow_nil => true, :allow_blank => true
 
   def self.nullable_attributes
-    [:registration_number, :street_name, :country_code, :fare_code, :nearest_topic_name, :comment, :long_lat_type, :zip_code, :city_name]
+    [:registration_number, :street_name, :country_code, :fare_code, 
+     :nearest_topic_name, :comment, :long_lat_type, :zip_code, :city_name, :url, :time_zone]
   end
 
   after_update :clean_invalid_access_links

data/config/database.yml.me

@@ -0,0 +1,11 @@
+development:
+  adapter: postgresql
+  database: ninoxe_dev
+  username: <%= ENV['USER'] %>
+  password: <%= ENV['USER'] %>
+  
+test:
+  adapter: postgresql
+  database: ninoxe_test
+  username: <%= ENV['USER'] %>
+  password: <%= ENV['USER'] %>

data/db/migrate/20141017075349_add_gtfs_fields_to_companies.rb

@@ -0,0 +1,8 @@
+class AddGtfsFieldsToCompanies < ActiveRecord::Migration
+  def change
+    change_table :companies do |t|
+      t.string :url
+      t.string :time_zone
+    end
+  end
+end

data/db/migrate/20141017075515_add_gtfs_fields_to_stop_areas.rb

@@ -0,0 +1,8 @@
+class AddGtfsFieldsToStopAreas < ActiveRecord::Migration
+  def change
+    change_table :stop_areas do |t|
+      t.string :url
+      t.string :time_zone
+    end
+  end
+end

data/db/migrate/20141017075627_add_gtfs_fields_to_lines.rb

@@ -0,0 +1,9 @@
+class AddGtfsFieldsToLines < ActiveRecord::Migration
+  def change
+    change_table :lines do |t|
+      t.string :url
+      t.string :color, :limit => 6
+      t.string :text_color, :limit => 6
+    end
+  end
+end

data/lib/ninoxe/version.rb

@@ -1,3 +1,3 @@
 module Ninoxe
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/lib/ninoxe.rb~

@@ -0,0 +1,7 @@
+require "ninoxe/engine"
+
+require "acts_as_list"
+require "composite_primary_keys"
+
+module Ninoxe
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ninoxe
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Marc Florisson
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: georuby-ext
@@ -325,6 +325,7 @@ files:
 - app/views/layouts/ninoxe/application.html.erb
 - config/database.yml
 - config/database.yml.ci
+- config/database.yml.me
 - config/database.yml.travis
 - config/locales/en.yml
 - config/locales/fr.yml
@@ -374,6 +375,9 @@ files:
 - db/migrate/20140718141706_add_missing_taggable_index.acts_as_taggable_on_engine.rb
 - db/migrate/20140820060801_add_zip_code_and_city_name_to_stop_area.rb
 - db/migrate/20140820060814_add_zip_code_and_city_name_to_access_point.rb
+- db/migrate/20141017075349_add_gtfs_fields_to_companies.rb
+- db/migrate/20141017075515_add_gtfs_fields_to_stop_areas.rb
+- db/migrate/20141017075627_add_gtfs_fields_to_lines.rb
 - lib/chouette_factories.rb
 - lib/factories/chouette_access_links.rb
 - lib/factories/chouette_access_points.rb
@@ -390,6 +394,7 @@ files:
 - lib/factories/chouette_vehicle_journey.rb
 - lib/factories/chouette_vehicle_journey_at_stop.rb
 - lib/ninoxe.rb
+- lib/ninoxe.rb~
 - lib/ninoxe/engine.rb
 - lib/ninoxe/version.rb
 homepage: http://github.com/afimb/ninoxe