legislation-uk 0.0.1 → 0.0.2

data/CHANGELOG

@@ -1 +1,2 @@
+v0.0.2 now returns opsi url, statutelaw url and legislation url
 v0.0.1 initial alpha release

data/README

@@ -21,16 +21,24 @@ Should be up at rubyforge, so to install:
 
 Can be used from command line if you run irb:
 
- irb
+> irb
 
  require 'rubygems'
  require 'legislation_uk'
 
  legislation = Legislation::UK.find('Channel Tunnel Rail Link Act 1996')
 
- legislation.parts.size  #=> 3
+ legislation.title           #=> "Channel Tunnel Rail Link Act 1996"
 
- legislation.parts.collect(&:number)  #=> ["Part I", "Part II", "Part III"]
+ legislation.legislation_url #=> "http://www.legislation.gov.uk/ukpga/1996/61"
+
+ legislation.opsi_url        #=> "http://www.opsi.gov.uk/acts/acts1996/ukpga_19960061_en_1"
+
+ legislation.statutelaw_url  #=> "http://www.statutelaw.gov.uk/documents/1996/61/ukpga/c61"
+
+ legislation.parts.size      #=> 3
+
+ legislation.parts.collect(&:number) #=> ["Part I", "Part II", "Part III"]
 
  legislation.parts.collect(&:title)  #=> ["The Channel Tunnel Rail Link",
                                      #    "The A2 and M2 Improvement Works",

data/lib/legislation_uk.rb

@@ -1,5 +1,5 @@
-require 'activesupport'
 require 'morph'
+require 'hpricot'
 require 'open-uri'
 
 module LegislationUK
@@ -10,19 +10,71 @@ module LegislationUK
     end
   end
 
+  module ItemNumber
+    def number
+      contents_number
+    end
+  end
+
   class Legislation
     include Morph
+
+    def self.open_uri uri
+      open(uri).read
+    end
+
+    def legislation_url
+      document_uri
+    end
+
+    def statutelaw_url
+      if legislation_url[%r|http://www.legislation.gov.uk/(.+)/(\d\d\d\d)/(\d+)|]
+        type = $1
+        year = $2
+        chapter = $3
+        "http://www.statutelaw.gov.uk/documents/#{year}/#{chapter}/#{type}/c#{chapter}"
+      else
+        nil
+      end
+    end
+
+    def title
+      metadata.title
+    end
+
     def parts
       contents ? contents.contents_parts : []
     end
+
+    def opsi_url
+      unless @opsi_url
+        search_url = "http://search.opsi.gov.uk/search?q=#{URI.escape(title)}&output=xml_no_dtd&client=opsisearch_semaphore&site=opsi_collection"
+        begin
+          doc = Hpricot.XML Legislation.open_uri(search_url)
+          url = nil
+
+          (doc/'R/T').each do |result|
+            unless url
+              term = result.inner_text.gsub(/<[^>]+>/,'').strip
+              url = result.at('../U/text()').to_s if(title == term || term.starts_with?(title))
+            end
+          end
+
+          @opsi_url = url
+        rescue Exception => e
+          puts 'error retrieving: ' + search_url
+          puts e.class.name
+          puts e.to_s
+        end
+      end
+      @opsi_url
+    end
   end
 
   class ContentsPart
     include Morph
     include Title
-    def number
-      contents_number
-    end
+    include ItemNumber
     def blocks
       contents_pblocks ? contents_pblocks : []
     end
@@ -31,6 +83,16 @@ module LegislationUK
   class ContentsPblock
     include Morph
     include Title
+
+    def sections
+      contents_items
+    end
+  end
+
+  class ContentsItem
+    include Morph
+    include Title
+    include ItemNumber
   end
 end
 
@@ -38,7 +100,7 @@ end
 # See README for usage documentation.
 module Legislation
   module UK
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
 
     def self.open_uri uri
       open(uri).read
@@ -53,9 +115,9 @@ module Legislation
     end
 
     def self.find title, number=nil
-      number_part = number ? "&number=#{number}" : ''
-      search_url = "http://www.legislation.gov.uk/id?title=#{URI.escape(title)}#{number_part}"
       begin
+        number_part = number ? "&number=#{number}" : ''
+        search_url = "http://www.legislation.gov.uk/id?title=#{URI.escape(title)}#{number_part}"
         xml = Legislation::UK.open_uri(search_url)
         to_object(xml)
       rescue Exception => e
@@ -67,13 +129,5 @@ module Legislation
       end
     end
 
-    def self.find_uri title, number=nil
-      legislation = find(title, number)
-      if legislation
-        legislation.document_uri
-      else
-        nil
-      end
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: legislation-uk
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Rob McKinnon
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-24 00:00:00 +01:00
+date: 2009-09-29 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,47 +23,45 @@ dependencies:
         version: 0.2.7
     version: 
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: hpricot
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.2
+        version: 0.8.1
     version: 
-description: |
-  Ruby API to the restful UK legislation XML service hosted at: http://www.legislation.gov.uk/
-
-email: 
-- rob ~@nospam@~ rubyforge.org
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+description: Ruby API for accessing UK Legislation hosted at http://www.legislation.gov.uk/
+email: rob ~@nospam@~ rubyforge.org
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
 - README
-- CHANGELOG
 files: 
-- README
 - CHANGELOG
-- Rakefile
+- README
 - lib/legislation_uk.rb
-- Manifest
-- legislation-uk.gemspec
 has_rdoc: true
-homepage: ""
+homepage: http://github.com/robmckinnon/legislation-uk
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- Legislation-uk
 - --main
 - README
-- --inline-source
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -76,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "1.2"
+      version: "0"
   version: 
 requirements: []
 
@@ -84,6 +82,6 @@ rubyforge_project: legislation-uk
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: "Ruby API to the restful UK legislation XML service hosted at: http://www.legislation.gov.uk/"
+summary: Ruby API for http://www.legislation.gov.uk/
 test_files: []
 

data/Manifest

@@ -1,5 +0,0 @@
-README
-CHANGELOG
-Rakefile
-lib/legislation_uk.rb
-Manifest

data/Rakefile

@@ -1,32 +0,0 @@
-require 'rubygems'
-require 'lib/legislation_uk'
-
-begin
-  require 'spec'
-rescue LoadError
-  puts "\nYou need to install the rspec gem to perform meta operations on this gem"
-  puts "  sudo gem install rspec\n"
-end
-
-begin
-  require 'echoe'
-
-  Echoe.new("legislation-uk", Legislation::UK::VERSION) do |m|
-    m.author = ["Rob McKinnon"]
-    m.email = ["rob ~@nospam@~ rubyforge.org"]
-    m.description = File.readlines("README").first
-    m.rubyforge_name = "legislation-uk"
-    m.rdoc_options << '--inline-source'
-    m.dependencies = ["morph >=0.2.7", "activesupport >=2.0.2"]
-    m.rdoc_pattern = ["README", "CHANGELOG"] #, "LICENSE"]
-  end
-
-rescue LoadError
-  puts "\nYou need to install the echoe gem to perform meta operations on this gem"
-  puts "  sudo gem install echoe\n\n"
-end
-
-desc "Open an irb session preloaded with this library"
-task :console do
-  sh "irb -rubygems -r ./lib/legislation_uk.rb"
-end

data/legislation-uk.gemspec

@@ -1,37 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{legislation-uk}
-  s.version = "0.0.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Rob McKinnon"]
-  s.date = %q{2009-09-24}
-  s.description = %q{Ruby API to the restful UK legislation XML service hosted at: http://www.legislation.gov.uk/
-}
-  s.email = ["rob ~@nospam@~ rubyforge.org"]
-  s.extra_rdoc_files = ["README", "CHANGELOG"]
-  s.files = ["README", "CHANGELOG", "Rakefile", "lib/legislation_uk.rb", "Manifest", "legislation-uk.gemspec"]
-  s.homepage = %q{}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Legislation-uk", "--main", "README", "--inline-source"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{legislation-uk}
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Ruby API to the restful UK legislation XML service hosted at: http://www.legislation.gov.uk/}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<morph>, [">= 0.2.7"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.0.2"])
-    else
-      s.add_dependency(%q<morph>, [">= 0.2.7"])
-      s.add_dependency(%q<activesupport>, [">= 2.0.2"])
-    end
-  else
-    s.add_dependency(%q<morph>, [">= 0.2.7"])
-    s.add_dependency(%q<activesupport>, [">= 2.0.2"])
-  end
-end