billit_representers 0.9.10 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d604d517fc2f630788969944a8712104a62c301b
-  data.tar.gz: 8b63779bfeafaa063f6f39c52647aae44e492078
+  metadata.gz: 0e7b2d3366a2fa0381d3603829f94a559ca8afcf
+  data.tar.gz: 3b550d6d14231deface3bb15ddba3ca63b5298ba
 SHA512:
-  metadata.gz: 2e1bfc8a2c7294d9c0bbcb9dac9fb2cc02cc0e1c428ec546310862496cf4cdebaee7b22ee7fc0074d0344e4185174f173c5b577e7a7859021653067ab49df7dc
-  data.tar.gz: aebdb425e1242f3df8515a4651fb52854798778625d0bb888eda418e13f99dffd3af99afb222cfff46e468efe5629d5a961937d9905c940d1dab5690685e091c
+  metadata.gz: 0c2d6222425e8eb8218a3fe43195024e9a5605a4647e3012f990988bda5cde4a96e4eff3227ab2e5c00799479d9de75745da75af29e1b9b135a56dae2c502711
+  data.tar.gz: ad82baa96f6cbd19340cb85822a7bb59b2fca1b53b7fe953937f3e143c8fe0d6c65bc185c3dd992b1bcf348941327e1cac7175d0906759f014a2e795f85bdeea

data/billit_representers.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |gem|
   gem.name        = 'billit_representers'
-  gem.version     = '0.9.10'
-  gem.date        = '2014-07-01'
+  gem.version     = '0.10.0'
+  gem.date        = '2014-03-31'
   gem.summary     = "Representers for the bill-it module of the Poplus project."
   gem.description = "Representers for the bill-it module of the Poplus project. These provide object-like access to remote data, using Resource-Oriented Architectures in Ruby (ROAR)."
   gem.authors     = ["Marcel Augsburger"]
@@ -11,6 +11,7 @@ Gem::Specification.new do |gem|
 
   gem.files       = `git ls-files`.split("\n")
 
+  # gem.add_runtime_dependency "roar", "0.12.2"
   gem.add_runtime_dependency "roar", "0.11.19"
   gem.add_runtime_dependency "roar-rails", "0.1.0"
   gem.add_runtime_dependency "activemodel"

data/lib/billit_representers/models/cl/bill.rb

@@ -0,0 +1,26 @@
+require 'billit_representers/representers/cl/bill_representer'
+module Billit
+  module Cl
+    class Bill
+      include Billit::Cl::BillRepresenter
+
+      attr_reader :representable_attrs
+
+      def self_link
+    	  links[:self].href if links[:self]
+    	end
+
+    	def law_xml_link
+    	  links[:law_xml].href if links[:law_xml]
+    	end
+
+    	def law_web_link
+    	  links[:law_web].href if links[:law_web]
+    	end
+
+    	def bill_draft_link
+    	  links[:bill_draft].href if links[:bill_draft]
+    	end
+    end
+  end
+end

data/lib/billit_representers/models/cl/bill_basic.rb

@@ -0,0 +1,26 @@
+require 'billit_representers/representers/cl/bill_basic_representer'
+module Billit
+  module Cl
+    class BillBasic
+      include Billit::Cl::BillBasicRepresenter
+
+      attr_reader :representable_attrs
+
+      def self_link
+        links[:self].href if links[:self]
+    	end
+
+    	def law_xml_link
+    	  links[:law_xml].href if links[:law_xml]
+    	end
+
+    	def law_web_link
+    	  links[:law_web].href if links[:law_web]
+    	end
+
+    	def bill_draft_link
+    	  links[:bill_draft].href if links[:bill_draft]
+    	end
+    end
+  end
+end

data/lib/billit_representers/models/cl/bill_page.rb

@@ -0,0 +1,20 @@
+require 'billit_representers/representers/cl/bill_page_representer'
+module Billit
+  module Cl
+    class BillPage
+      include Billit::Cl::BillPageRepresenter
+
+      def self
+    	  links[:self].href if links[:self]
+    	end
+
+    	def next
+    	  links[:next].href if links[:next]
+    	end
+
+    	def previous
+    	  links[:previous].href if links[:previous]
+    	end
+    end
+  end
+end

data/lib/billit_representers/models/cl/directive.rb

@@ -0,0 +1,8 @@
+require 'billit_representers/representers/cl/directive_representer'
+module Billit
+  module Cl
+    class Directive
+      include Billit::Cl::DirectiveRepresenter
+    end
+  end
+end

data/lib/billit_representers/models/cl/document.rb

@@ -0,0 +1,8 @@
+require 'billit_representers/representers/cl/document_representer'
+module Billit
+  module Cl
+    class Document
+      include Billit::Cl::DocumentRepresenter
+    end
+  end
+end

data/lib/billit_representers/models/cl/paperwork.rb

@@ -0,0 +1,8 @@
+require 'billit_representers/representers/cl/paperwork_representer'
+module Billit
+  module Cl
+    class Paperwork
+      include Billit::Cl::PaperworkRepresenter
+    end
+  end
+end

data/lib/billit_representers/models/cl/paperwork_page.rb

@@ -0,0 +1,8 @@
+require 'billit_representers/representers/cl/paperwork_page_representer'
+module Billit
+  module Cl
+    class PaperworkCollection
+      include Billit::Cl::PaperworkPageRepresenter
+    end
+  end
+end

data/lib/billit_representers/models/cl/priority.rb

@@ -0,0 +1,8 @@
+require 'billit_representers/representers/cl/priority_representer'
+module Billit
+  module Cl
+    class Priority
+      include Billit::Cl::PriorityRepresenter
+    end
+  end
+end

data/lib/billit_representers/models/cl/remark.rb

@@ -0,0 +1,8 @@
+require 'billit_representers/representers/cl/remark_representer'
+module Billit
+  module Cl
+    class Remark
+      include Billit::Cl::RemarkRepresenter
+    end
+  end
+end

data/lib/billit_representers/models/cl/report.rb

@@ -0,0 +1,8 @@
+require 'billit_representers/representers/cl/report_representer'
+module Billit
+  module Cl
+    class Report
+      include Billit::Cl::ReportRepresenter
+    end
+  end
+end

data/lib/billit_representers/models/cl/revision.rb

@@ -0,0 +1,8 @@
+require 'billit_representers/representers/cl/revision_representer'
+module Billit
+  module Cl
+    class Revision
+      include Billit::Cl::RevisionRepresenter
+    end
+  end
+end

data/lib/billit_representers/representers/bill_page_representer.rb

@@ -1,6 +1,6 @@
 require 'roar/representer/json'
-require 'billit_representers/models/bill_basic'
-require 'billit_representers/representers/bill_basic_representer'
+require 'billit_representers/models/bill'
+require 'billit_representers/representers/bill_representer'
 
 module Billit
   module BillPageRepresenter
@@ -21,7 +21,7 @@ module Billit
       klass.send :include, Roar::Representer::Feature::HttpVerbs
     end
 
-    collection :bills, :extend => Billit::BillBasicRepresenter, :class => Billit::BillBasic
+    collection :bills, :extend => Billit::BillRepresenter, :class => Billit::Bill
 
     property :total_entries
     property :current_page

data/lib/billit_representers/representers/bill_representer.rb

@@ -5,22 +5,6 @@ require 'roar/representer/json'
 require 'roar/representer/json/hal'
 # require 'roar/rails/hal'
 require 'active_model'
-require 'billit_representers/representers/paperwork_representer'
-require 'billit_representers/representers/priority_representer'
-require 'billit_representers/representers/report_representer'
-require 'billit_representers/representers/document_representer'
-require 'billit_representers/representers/directive_representer'
-require 'billit_representers/representers/remark_representer'
-require 'billit_representers/representers/revision_representer'
-require 'billit_representers/representers/motion_representer'
-require 'billit_representers/models/paperwork'
-require 'billit_representers/models/priority'
-require 'billit_representers/models/report'
-require 'billit_representers/models/document'
-require 'billit_representers/models/directive'
-require 'billit_representers/models/remark'
-require 'billit_representers/models/revision'
-require 'billit_representers/models/motion'
 
 module Billit
   module BillRepresenter
@@ -40,121 +24,24 @@ module Billit
       klass.send :prepend, Initializer
       klass.send :include, ActiveModel::Validations
       klass.send :include, Roar::Representer::Feature::HttpVerbs
-      klass.validates_presence_of :uid
-      klass.validates :subject_areas, inclusion: { in: @@subject_areas_valid_values }
-      klass.validates :stage, inclusion: { in: @@stage_valid_values }
-      klass.validates :initial_chamber, inclusion: { in: @@initial_chamber_valid_values }
-      klass.validates :current_priority, inclusion: { in: @@current_priority_valid_values }
     end
 
     property :uid
-    property :short_uid
     property :title
-    property :creation_date
-    property :source
-    property :initial_chamber
-    property :current_priority
-    property :stage
-    property :sub_stage
+    property :abstract
     property :status
-    property :resulting_document
-    property :law_id
-    property :bill_draft_link
-    property :merged_bills
-    property :subject_areas
     property :authors
+    property :resulting_document
+    property :creation_date
     property :publish_date
-    property :abstract
     property :tags
 
-    collection :paperworks, extend: Billit::PaperworkRepresenter, class: lambda { |x, *| Object.const_defined?("Paperwork") ? Paperwork : BillitPaperwork }
-    collection :priorities, extend: Billit::PriorityRepresenter, class: lambda { |x, *| Object.const_defined?("Priority") ? Priority : BillitPriority }
-    collection :reports, extend: Billit::ReportRepresenter, class: lambda { |x, *| Object.const_defined?("Report") ? Report : BillitReport }
-    collection :documents, extend: Billit::DocumentRepresenter, class: lambda { |x, *| Object.const_defined?("Document") ? Document : BillitDocument }
-    collection :directives, extend: Billit::DirectiveRepresenter, class: lambda { |x, *| Object.const_defined?("Directive") ? Directive : BillitDirective }
-    collection :remarks, extend: Billit::RemarkRepresenter, class: lambda { |x, *| Object.const_defined?("Remark") ? Remark : BillitRemark }
-    collection :revisions, extend: Billit::RevisionRepresenter, class: lambda { |x, *| Object.const_defined?("Revision") ? Revision : BillitRevision }
-    collection :motions, extend: Billit::MotionRepresenter, class: lambda { |x, *| Object.const_defined?("Motion") ? Motion : BillitMotion }
-
     link :self do
-      bill_url(self.uid)
+      cl_bill_url(self.uid)
     end
 
-    link :law_xml do 
-        self.law_xml_link
+    link :bill_draft do 
+        self.bill_draft_link
     end
-
-    link :law_web do 
-        self.law_web_link
-    end
-
-    @@subject_areas_valid_values =
-      [
-        'Defensa',
-        'Impuestos',
-        'Economía',
-        'Empresas',
-        'Hacienda',
-        'Relaciones Exteriores',
-        'Administración',
-        'Asunto Indígena',
-        'Zona Extrema',
-        'Regionalización',
-        'Salud',
-        'Minería',
-        'Medio Ambiente',
-        'Derechos Animales',
-        'Vivienda',
-        'Obras Públicas',
-        'Transporte',
-        'Telecomunicaciones',
-        'Trabajo',
-        'Protección Social',
-        'Cultura',
-        'Educación',
-        'Deportes',
-        'Transparencia',
-        'Probidad',
-        'Elecciones',
-        'Participación',
-        'Familia',
-        'Seguridad',
-        'Derechos Fundamentales',
-        'Nacionalidad',
-        'Reconstrucción Terremoto'
-      ]
-
-    @@stage_valid_values =
-      [
-        'Archivado',
-        'Comisión Mixta Ley de Presupuesto',
-        'Comisión Mixta por rechazo de idea de legislar',
-        'Comisión Mixta por rechazo de modificaciones',
-        'Disc. informe C.Mixta por rechazo de modific. en C...',
-        'Discusión veto en Cámara de Origen',
-        'Discusión veto en Cámara Revisora',
-        'Insistencia',
-        'Primer trámite constitucional',
-        'Retirado',
-        'Segundo trámite constitucional',
-        'Tercer trámite constitucional',
-        'Tramitación terminada',
-        'Trámite de aprobacion presidencial',
-        'Trámite finalización en Cámara de Origen'
-      ]
-
-    @@initial_chamber_valid_values =
-      [
-        'C.Diputados',
-        'Senado'
-      ]
-
-    @@current_priority_valid_values =
-      [
-        'Discusión inmediata',
-        'Simple',
-        'Sin urgencia',
-        'Suma'
-      ]
   end
 end

data/lib/billit_representers/representers/cl/bill_basic_representer.rb

@@ -0,0 +1,140 @@
+require 'roar/representer'
+require 'roar/representer/feature/http_verbs'
+require 'roar/representer/feature/client'
+require 'roar/representer/json'
+require 'roar/representer/json/hal'
+# require 'roar/rails/hal'
+require 'active_model'
+
+module Billit
+  module Cl
+    module BillBasicRepresenter
+      include Roar::Representer::JSON::HAL
+      # include Roar::Rails::HAL
+      # include Roar::Representer::JSON
+
+      module Initializer
+        def initialize
+          extend Billit::Cl::BillBasicRepresenter
+          extend Roar::Representer::Feature::Client
+          super
+        end
+      end
+
+      def self.included(klass)
+        klass.send :prepend, Initializer
+        klass.send :include, ActiveModel::Validations
+        klass.send :include, Roar::Representer::Feature::HttpVerbs
+        klass.validates_presence_of :uid
+        klass.validates :subject_areas, inclusion: { in: @@subject_areas_valid_values }
+        klass.validates :stage, inclusion: { in: @@stage_valid_values }
+        klass.validates :initial_chamber, inclusion: { in: @@initial_chamber_valid_values }
+        klass.validates :current_priority, inclusion: { in: @@current_priority_valid_values }
+      end
+
+      property :uid
+      property :short_uid, writeable: false
+      property :title
+      property :creation_date
+      property :source
+      property :initial_chamber
+      property :current_priority, writeable: false
+      property :stage
+      property :sub_stage
+      property :status
+      property :resulting_document
+      property :law_id, writeable: false
+      property :merged_bills
+      property :subject_areas
+      property :authors
+      property :publish_date
+      property :abstract
+      property :tags
+
+      link :self do
+        cl_bill_url(self.uid)
+      end
+
+      link :law_xml do 
+          self.law_xml_link
+      end
+
+      link :law_web do 
+          self.law_web_link
+      end
+
+      link :bill_draft do 
+          self.bill_draft_link
+      end
+
+      @@subject_areas_valid_values =
+        [
+          'Defensa',
+          'Impuestos',
+          'Economía',
+          'Empresas',
+          'Hacienda',
+          'Relaciones Exteriores',
+          'Administración',
+          'Asunto Indígena',
+          'Zona Extrema',
+          'Regionalización',
+          'Salud',
+          'Minería',
+          'Medio Ambiente',
+          'Derechos Animales',
+          'Vivienda',
+          'Obras Públicas',
+          'Transporte',
+          'Telecomunicaciones',
+          'Trabajo',
+          'Protección Social',
+          'Cultura',
+          'Educación',
+          'Deportes',
+          'Transparencia',
+          'Probidad',
+          'Elecciones',
+          'Participación',
+          'Familia',
+          'Seguridad',
+          'Derechos Fundamentales',
+          'Nacionalidad',
+          'Reconstrucción Terremoto'
+        ]
+
+      @@stage_valid_values =
+        [
+          'Archivado',
+          'Comisión Mixta Ley de Presupuesto',
+          'Comisión Mixta por rechazo de idea de legislar',
+          'Comisión Mixta por rechazo de modificaciones',
+          'Disc. informe C.Mixta por rechazo de modific. en C...',
+          'Discusión veto en Cámara de Origen',
+          'Discusión veto en Cámara Revisora',
+          'Insistencia',
+          'Primer trámite constitucional',
+          'Retirado',
+          'Segundo trámite constitucional',
+          'Tercer trámite constitucional',
+          'Tramitación terminada',
+          'Trámite de aprobacion presidencial',
+          'Trámite finalización en Cámara de Origen'
+        ]
+
+      @@initial_chamber_valid_values =
+        [
+          'C.Diputados',
+          'Senado'
+        ]
+
+      @@current_priority_valid_values =
+        [
+          'Discusión inmediata',
+          'Simple',
+          'Sin urgencia',
+          'Suma'
+        ]
+    end
+  end
+end